Changeset 6447

Timestamp:

03/06/08 13:24:18 (6 months ago)

Author:

tschaub

Message:

Adding explicit eventListener unregistering in map, layer, and control destroy methods. Note that this only makes explicit what is already happening elsewhere, but it makes us feel complete. Also throwing in the example I missed in the previous change. r=euzuro (closes #1404)

Files:

• trunk/openlayers/examples/events.html (added)
• trunk/openlayers/lib/OpenLayers/Control.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Map.js (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Control.js

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

trunk/openlayers/lib/OpenLayers/Layer.js

@@ -316 +316 @@
-
-        if (this.events) {
+            if(this.eventListeners) {
+                this.events.un(this.eventListeners);
+            }
-            this.events.destroy();
-        }
+        this.eventListeners = null;
-        this.events = null;
-    },

trunk/openlayers/lib/OpenLayers/Map.js

@@ -546 +546 @@
-        this.viewPortDiv = null;
-
+        if(this.eventListeners) {
+            this.events.un(this.eventListeners);
+            this.eventListeners = null;
+        }
-        this.events.destroy();
-        this.events = null;