Changeset 862

Timestamp:

05/23/09 08:21:00 (1 year ago)

Author:

tschaub

Message:

In cases where a MapPanel creates a map, it should also destroy the map. r=ahocevar (closes #72)

Files:

• core/trunk/geoext/lib/GeoExt/widgets/MapPanel.js (modified) (1 diff)
• core/trunk/geoext/tests/lib/GeoExt/widgets/MapPanel.html (modified) (1 diff)

core/trunk/geoext/lib/GeoExt/widgets/MapPanel.js

@@ -171 +171 @@
-    },
-    
-on
+before
-     *  Private method called during the destroy sequence.
-     */
-on
+before
-        if(this.ownerCt) {
-            this.ownerCt.un("move", this.updateMapSize, this);
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    

core/trunk/geoext/tests/lib/GeoExt/widgets/MapPanel.html

@@ -176 +176 @@
-
-        }
+        
+        function test_destroy(t) {
+            
+            /**
+             * If the panel is passed an instance of OpenLayers.Map, we don't
+             * touch it in the destroy sequence, we only remove our reference
+             * to it.  If the panel is passed a map config object, the panel
+             * creates the OpenLayers.Map instance, and the panel destroys the
+             * map in its destroy sequence.
+             */
+            
+            t.plan(3);
+            
+            var panel = new GeoExt.MapPanel({
+                renderTo: "mappanel",
+                layers: [
+                    new OpenLayers.Layer("test")
+                ],
+                zoom: 1
+            });
+            
+            t.ok(panel.map instanceof OpenLayers.Map, "panel creates a map");
+            
+            var called = false;
+            panel.map.destroy = function() {
+                called = true;
+                OpenLayers.Map.prototype.destroy.apply(panel.map, arguments);
+            }
+            try {
+                panel.destroy();
+                t.ok(called, "panel.destroy calls map.destroy");
+            } catch(err) {
+                t.fail("panel.destroy causes problems: " + err);
+            }
+            t.ok(!panel.map, "panel has no reference to a map");
+            
+        }
-
-