ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

additional patch for #742 - removeControl() now takes the control as argument, not the id

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@3329 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
euzuro
2007-06-14 19:18:57 +00:00
parent 385da5c614
commit 8874a6069f
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers/Map.js
+4 -4
View File
@@ -621,11 +621,11 @@ OpenLayers.Map.prototype = {
* object's internal array of controls, as well as from the map's * object's internal array of controls, as well as from the map's
* viewPort (assuming the control was not added outsideViewport) * viewPort (assuming the control was not added outsideViewport)
* *
* @param {String} id ID of the control to remove * @param {OpenLayers.Control} control control to remove
*/ */
removeControl: function (id) { removeControl: function (control) {
var control = this.getControl(id); //make sure control is non-null and actually part of our map
if (control) { if ( (control) && (control == this.getControl(control.id)) ) {
if (!control.outsideViewport) { if (!control.outsideViewport) {
this.viewPortDiv.removeChild(control.div) this.viewPortDiv.removeChild(control.div)
} }
tests/test_Map.html
+3 -2
View File
@@ -431,7 +431,7 @@
t.ok(foundDiv, "new control's div correctly added to viewPort"); t.ok(foundDiv, "new control's div correctly added to viewPort");
//remove control //remove control
map1.removeControl(control.id) map1.removeControl(control)
newNumControls = map1.controls.length; newNumControls = map1.controls.length;
t.ok( newNumControls == oldNumControls, "removing the control decreases control count") t.ok( newNumControls == oldNumControls, "removing the control decreases control count")
@@ -448,7 +448,8 @@
t.ok(!foundDiv, "control no longer child of viewPort"); t.ok(!foundDiv, "control no longer child of viewPort");
//remove bogus //remove bogus
map1.removeControl("bogus id"); control = { id: "bogus id" };
map1.removeControl(control);
newNumControls = map1.controls.length; newNumControls = map1.controls.length;
t.ok( newNumControls == oldNumControls, "removing bad controlid doesnt crash or decrease control count") t.ok( newNumControls == oldNumControls, "removing bad controlid doesnt crash or decrease control count")
} }