Changeset 7485

Timestamp:

07/09/08 11:44:06 (2 months ago)

Author:

elemoine

Message:

destroy things in correct order; in particular destroy strategies before destroying the renderer, strategies may required the renderer when destroying features for example

Files:

• sandbox/vector-behavior/lib/OpenLayers/Layer/Vector.js (modified) (2 diffs)

sandbox/vector-behavior/lib/OpenLayers/Layer/Vector.js

@@ -235 +235 @@
-     */
-    destroy: function() {
+        if (this.stategies) {
+            for(var i = 0; i < this.strategies.length; i++){
+                this.strategies[i].destroy();
+                this.strategies[i] = null;
+            }
+            this.strategies = null;
+        }
+        if (this.strategy) {
+            this.strategy.destroy();
+            this.strategy = null;
+        }
+        if (this.protocol) {
+            this.protocol.destroy();
+            this.protocol = null;
+        }
-        this.destroyFeatures();
-        this.features = null;
@@ -245 +260 @@
-        this.geometryType = null;
-        this.drawn = null;
-
-        if (this.protocol) {
-            this.protocol.destroy();
-            this.protocol = null;
-        }
-        if (this.stategies) {
-            for(var i = 0; i < this.strategies.length; i++){
-                this.strategies[i].destroy();
-                this.strategies[i] = null;
-            }
-            this.strategies = null;
-        }
-        if (this.strategy) {
-            this.strategy.destroy();
-            this.strategy = null;
-        }
-        OpenLayers.Layer.prototype.destroy.apply(this, arguments);  
-    },