Ticket #1427: patch-1427-r7546-A1.diff

tests/Control/ModifyFeature.html

@@ -164 +164 @@
-    }    
-
-    function test_selectFeature(t) {
-5
+6
-        var layer = new OpenLayers.Layer.Vector();
-        var control = new OpenLayers.Control.ModifyFeature(layer);
-        control.vertices = [];
-        control.virtualVertices = [];
-
-
-
+
+
+
+
-        control.dragControl.activate = function() { t.ok(true, "drag Control activated"); }
-        control.onModificationStart = function(feature)  { t.eq(feature.id, fakeFeature.id, "On Modification Start called with correct feature."); } 
-        
@@ -211 +212 @@
-
-        // Features are removed whenever they exist
-        control.selectFeature({feature: fakeFeature});
+        layer.events.un({"beforefeaturemodified": callback});
+
+        // Check that selectFeature does nothing if a beforefeaturemodified
+        // listener returns false
+        var callback = function(obj) {
+            t.eq(obj.feature, fakeFeature, "beforefeaturemodified triggered");
+            return false;
+        };
+        layer.events.on({"beforefeaturemodified": callback});
+        var getTestFunction = function(funcName) {
+            return function() {
+                t.fail(funcName + " called with a beforefeaturemodified listener returned false");
+            };
+        };
+        control.resetVertices = getTestFunction("resetVertices");
+        control.dragControl.activate = getTestFunction("dragControl.activate");
+        control.onModificationStart = getTestFunction("onModificationStart");
+        control.selectFeature({feature: fakeFeature});
+        layer.events.un({"beforefeaturemodified": callback});
-        
-        control.destroy();
-        layer.destroy();

lib/OpenLayers/Control/ModifyFeature.js

@@ -297 +297 @@
-     *     selected feature.
-     */
-    selectFeature: function(object) {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    },
-
-    /**