Changeset 5465

Timestamp:

12/17/07 03:03:01 (1 year ago)

Author:

elemoine

Message:

Subclasses of markers layer should destroy, then clear their list of markers.
Thanks crschmidt for the review. (closes #1123)

Files:

• trunk/openlayers/lib/OpenLayers/Layer/GeoRSS.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/Text.js (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Layer/GeoRSS.js

@@ -76 +76 @@
-     */
-    destroy: function() {
+        // Warning: Layer.Markers.destroy() must be called prior to calling
+        // clearFeatures() here, otherwise we leak memory. Indeed, if
+        // Layer.Markers.destroy() is called after clearFeatures(), it won't be
+        // able to remove the marker image elements from the layer's div since
+        // the markers will have been destroyed by clearFeatures().
+        OpenLayers.Layer.Markers.prototype.destroy.apply(this, arguments);
-        this.clearFeatures();
-        this.features = null;
-        OpenLayers.Layer.Markers.prototype.destroy.apply(this, arguments);
-    },
-        

trunk/openlayers/lib/OpenLayers/Layer/Text.js

@@ -87 +87 @@
-     */
-    destroy: function() {
+        // Warning: Layer.Markers.destroy() must be called prior to calling
+        // clearFeatures() here, otherwise we leak memory. Indeed, if
+        // Layer.Markers.destroy() is called after clearFeatures(), it won't be
+        // able to remove the marker image elements from the layer's div since
+        // the markers will have been destroyed by clearFeatures().
+        OpenLayers.Layer.Markers.prototype.destroy.apply(this, arguments);
-        this.clearFeatures();
-        this.features = null;
-        OpenLayers.Layer.Markers.prototype.destroy.apply(this, arguments);
-    },
-