Changeset 5976

Timestamp:

02/03/08 12:35:39 (1 year ago)

Author:

elemoine

Message:

Add properties stopClick, stopDown, and stopUp to the feature handler. If
stopClick is true, clicks handled by the feature handler don't propagate to
other click listeners; otherwise handled clicks do propagate. The same kind of
rule applies to stopDown and stopUp. These properties default to true. Thanks
to Attila Csipa for expressing the need for this feature and cooking up the
first patch. r=tschaub. (closes #1266)

Files:

• trunk/openlayers/lib/OpenLayers/Handler/Feature.js (modified) (7 diffs)
• trunk/openlayers/tests/Handler/test_Feature.html (modified) (2 diffs)

trunk/openlayers/lib/OpenLayers/Handler/Feature.js

@@ -73 +73 @@
-     */
-    geometryTypes: null,
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    /**
-     * Property: layerIndex
@@ -107 +134 @@
-    mousedown: function(evt) {
-        this.down = evt.xy;
-!this.handle(evt)
+this.handle(evt) ? !this.stopDown : true
-    },
-    
@@ -120 +147 @@
-    mouseup: function(evt) {
-        this.up = evt.xy;
-!this.handle(evt)
+this.handle(evt) ? !this.stopUp : true
-    },
-
@@ -135 +162 @@
-     */
-    click: function(evt) {
-!this.handle(evt)
+this.handle(evt) ? !this.stopClick : true
-    },
-        
@@ -192 +219 @@
-     *
-     * Returns:
-Stop event propagation
+The event occurred over a relevant feature
-     */
-    handle: function(evt) {
-        var type = evt.type;
-stopEvtPropag
+handled
-        var previouslyIn = !!(this.feature); // previously in a feature
-        var click = (type == "click" || type == "dblclick");
@@ -213 +240 @@
-                }
-                this.lastFeature = this.feature;
-stopEvtPropag
+handled
-            } else {
-                // not in to a feature
@@ -226 +253 @@
-            }
-        }
-stopEvtPropag
+handled
-    },
-    

trunk/openlayers/tests/Handler/test_Feature.html

@@ -122 +122 @@
-        handler.handle("click", {}); 
-    }
+
-    function test_Handler_Feature_callbacks(t) {
-        t.plan(9);
@@ -239 +240 @@
-    }
-
+    function test_Handler_Feature_stopHandled(t) {
+        t.plan(3);
+        var map = new OpenLayers.Map('map');
+        var control = new OpenLayers.Control();
+        map.addControl(control);
+        var layer = new OpenLayers.Layer();
+        map.addLayer(layer);
+        var handler = new OpenLayers.Handler.Feature(control, layer);
+        handler.activate();
+        handler.handle = function(evt) { return /* handled */ true; };
+        var  evtPx = {xy: new OpenLayers.Pixel(Math.random(), Math.random())};
+        map.events.register("click", map, function(e) {
+            t.ok(!handler.stopClick, "clicks propagate with stopClick set to false" );
+        });
+        map.events.register("mousedown", map, function(e) {
+            t.ok(!handler.stopDown, "mousedown propagate with stopDown set to false" );
+        });
+        map.events.register("mouseup", map, function(e) {
+            t.ok(!handler.stopUp, "mouseup propagate with stopUp set to false" );
+        });
+
+        // 0 test
+        map.events.triggerEvent('click', evtPx);
+        // 0 test
+        map.events.triggerEvent('mousedown', evtPx);
+        // 0 test
+        map.events.triggerEvent('mousedown', evtPx);
+
+        // 1 test
+        handler.stopClick = false;
+        map.events.triggerEvent('click', evtPx);
+        // 1 test
+        handler.stopDown = false;
+        map.events.triggerEvent('mousedown', evtPx);
+        // 1 test
+        handler.stopUp = false;
+        map.events.triggerEvent('mouseup', evtPx);
+        
+        // 3 tests total
+    }
-
-  </script>