Changeset 6172

Timestamp:

02/09/08 13:51:48 (1 year ago)

Author:

ahocevar

Message:

Fixed several destroy() methods to avoid running into undefined objects when the page unloads. r=crschmidt,me (closes #1222)

Files:

• trunk/openlayers/lib/OpenLayers/Control.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Control/Panel.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Map.js (modified) (2 diffs)

trunk/openlayers/lib/OpenLayers/Control.js

@@ -167 +167 @@
-    destroy: function () {
-        this.events.destroy();
+        this.events = null;
-        // eliminate circular references
-        if (this.handler) {

trunk/openlayers/lib/OpenLayers/Control/Panel.js

@@ -46 +46 @@
-        OpenLayers.Control.prototype.destroy.apply(this, arguments);
-        for(var i = this.controls.length - 1 ; i >= 0; i--) {
-
-
-
-
-
+
+
+
+
+
+
+
-            OpenLayers.Event.stopObservingElement(this.controls[i].panel_div);
-            this.controls[i].panel_div = null;

trunk/openlayers/lib/OpenLayers/Map.js

@@ -486 +486 @@
-        }    
-
+        if (this.controls != null) {
+            for (var i = this.controls.length - 1; i>=0; --i) {
+                this.controls[i].destroy();
+            } 
+            this.controls = null;
+        }
-        if (this.layers != null) {
-            for (var i = this.layers.length - 1; i>=0; --i) {
@@ -493 +499 @@
-            } 
-            this.layers = null;
-        }
-        if (this.controls != null) {
-            for (var i = this.controls.length - 1; i>=0; --i) {
-                this.controls[i].destroy();
-            } 
-            this.controls = null;
-        }
-        if (this.viewPortDiv) {