Changeset 2874

Timestamp:

03/23/07 21:37:28 (2 years ago)

Author:

euzuro

Message:

applying (yet another) patch for #549. this one eliminates the double-destruction of the map due to the unload of window

Files:

• trunk/openlayers/lib/OpenLayers/Map.js (modified) (4 diffs)

trunk/openlayers/lib/OpenLayers/Map.js

@@ -33 +33 @@
-    /** @type OpenLayers.Events */
-    events: null,
+
+    /** function that is called to destroy the map on page unload. stored
+     *   here so that if map is manually destroyed, we can unregister this.
+     * 
+     * @type Function */
+    unloadDestroy: null,
-
-    /** the div that our map lives in
@@ -213 +219 @@
-        this.popups = new Array();
-
+        this.unloadDestroy = this.destroy.bindAsEventListener(this);
+        
+
-        // always call map.destroy()
-
-
-
+
-
-    },
@@ -224 +231 @@
-    */
-    destroy:function() {
+
+        // map has been destroyed. dont do it again!
+        OpenLayers.Event.stopObserving(window, 'unload', this.unloadDestroy);
+        this.unloadDestroy = null;
+
-        if (this.layers != null) {
-            for(var i=0; i< this.layers.length; i++) {
@@ -242 +254 @@
-        }
-        this.viewPortDiv = null;
+
+        this.events.destroy();
+        this.events = null;
+
-    },
-