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

Roll back changes from r8530: As Tim points out (See #1880), this breaks many

Browse Source 
tests and other aspects of OpenLayers. This patch should not have been 
committed. For now, revert the change, and then we can discuss a better
solution. (Rolling back change without review.)


git-svn-id: http://svn.openlayers.org/trunk/openlayers@8548 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
crschmidt
2008-12-23 23:20:59 +00:00
parent 40fb641a52
commit 1161049ed5
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/OpenLayers/Map.js
View File

@@ -1130,7 +1130,6 @@ OpenLayers.Map = OpenLayers.Class({
removeControl: function (control) { removeControl: function (control) {
//make sure control is non-null and actually part of our map //make sure control is non-null and actually part of our map
if ( (control) && (control == this.getControl(control.id)) ) { if ( (control) && (control == this.getControl(control.id)) ) {
control.deactivate();
if (control.div && (control.div.parentNode == this.viewPortDiv)) { if (control.div && (control.div.parentNode == this.viewPortDiv)) {
this.viewPortDiv.removeChild(control.div); this.viewPortDiv.removeChild(control.div);
} }

10
tests/Control.html
View File

@@ -59,16 +59,6 @@
control2.destroy(); control2.destroy();
} }
function test_Control_removeControl(t) {
t.plan(1);
var map = new OpenLayers.Map('map');
var control = new OpenLayers.Control();
map.addControl(control);
control.deactivate = function() {
t.ok(true, "Deactivate is called.");
};
map.removeControl(control);
}
function test_Control_destroy(t) { function test_Control_destroy(t) {
t.plan(3); t.plan(3);