Changeset 5974

Timestamp:

02/03/08 12:10:03 (1 year ago)

Author:

elemoine

Message:

The modify feature control destroys the vertex that was dragged in the drag
complete callback. Thus, the drag feature control won't detect a mouse-out on
that vertex and won't deactivate its drag handler. This causes errors because
the drag feature control has a feature to drag but that feature is destroyed
(feature.geometry is null). To prevent this, we make resetVertices explicitely
call outFeature on the drag feature control if the control has a feature to
drag. tschaub did most of the investigation on the problem. r=tschaub,me
(closes #1235)

Files:

• trunk/openlayers/lib/OpenLayers/Control/ModifyFeature.js (modified) (1 diff)
• trunk/openlayers/tests/Control/test_ModifyFeature.html (modified) (2 diffs)

trunk/openlayers/lib/OpenLayers/Control/ModifyFeature.js

@@ -429 +429 @@
-     */
-    resetVertices: function() {
+        // if coming from a drag complete we're about to destroy the vertex
+        // that was just dragged. For that reason, the drag feature control
+        // will never detect a mouse-out on that vertex, meaning that the drag
+        // handler won't be deactivated. This can cause errors because the drag
+        // feature control still has a feature to drag but that feature is
+        // destroyed. To prevent this, we call outFeature on the drag feature
+        // control if the control actually has a feature to drag.
+        if(this.dragControl.feature) {
+            this.dragControl.outFeature(this.dragControl.feature);
+        }
-        if(this.vertices.length > 0) {
-            this.layer.removeFeatures(this.vertices);

trunk/openlayers/tests/Control/test_ModifyFeature.html

@@ -250 +250 @@
-
-    function test_ModifyFeature_resetVertices(t) {
-7
+8
-        var layer = new OpenLayers.Layer.Vector();
-        var control = new OpenLayers.Control.ModifyFeature(layer);
@@ -300 +300 @@
-        t.eq(control.vertices.length, 3, "Correct vertices length with polygon (RESHAPE | RESIZE)");
-        t.eq(control.virtualVertices.length, 3, "Correct virtual vertices length (RESHAPE | RESIZE)");
+        
+        control.dragControl.feature = new OpenLayers.Feature.Vector(polygon);
+        control.dragControl.map = {};
+        control.dragControl.map.div = {};
+        control.dragControl.map.div.style = {};
+        control.dragControl.map.div.cursor = "foo";
+        control.dragControl.dragHandler.deactivate = function() {
+            this.active = false;
+        }
+        control.resetVertices();
+        t.ok(!control.dragControl.dragHandler.active, "resetVertices deactivates drag handler");
+        control.dragControl.map = null;
+        
+        control.destroy();
+        layer.destroy();
-    }    
-