Ticket #1697: destroy2x.2.patch

tests/Layer/Vector.html

@@ -238 +238 @@
-    }
-
-    function test_Layer_Vector_destroy (t) {
-4
+5
-
-        var options = {protocol: new OpenLayers.Protocol(), 
-                       strategies: [new OpenLayers.Strategy(), new OpenLayers.Strategy()]}
@@ -252 +252 @@
-
-        t.eq(layer.protocol, null, "layer.protocol is null after destroy");
-        t.eq(layer.strategies, null, "layer.strategies is null after destroy");
+        
+        // test that we can call layer.destroy a second time without trouble
+        try {
+            layer.destroy();
+            layer.destroy();
+            t.ok(true, "layer.destroy called twice without any issues");
+        } catch(err) {
+            t.fail("calling layer.destroy twice triggers exception: " + err + " in " + err.fileName + " line " + err.lineNumber);
+        }
+        
-    }
-
-    function test_Layer_Vector_externalGraphic(t) {

lib/OpenLayers/Layer/Vector.js

@@ -492 +492 @@
-     * options - {Object}
-     */
-    removeFeatures: function(features, options) {
+        if(!features || features.length === 0) {
+            return;
+        }
-        if (!(features instanceof Array)) {
-            features = [features];
-        }
-        if (features.length <= 0) {
-            return;
-        }
-
-        var notify = !options || !options.silent;
-
@@ -567 +567 @@
-        if(all) {
-            features = this.features;
-        }
-
-
-
+
+
+
+
+
-        }
-    },
-