Changeset 3033

Timestamp:

04/09/07 09:22:32 (2 years ago)

Author:

crschmidt

Message:

Fix for #554, click event and PanZoom control conflict, which was caused by
#484 in 2.3. This fixes the 2.2 -> current regression. Should be pulled
up to the 2.4 branch.

Files:

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

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

@@ -105 +105 @@
-        OpenLayers.Event.observe(btn, "dblclick", 
-                                 this.doubleClick.bindAsEventListener(btn));
+        OpenLayers.Event.observe(btn, "click", 
+                                 this.doubleClick.bindAsEventListener(btn));
-        btn.action = id;
-        btn.map = this.map;

trunk/openlayers/tests/Control/test_PanZoom.html

@@ -37 +37 @@
-            t.plan(0)
-        } else {
- 7 
+35
-            t.open_window( "Control/test_PanZoom.html", function( wnd ) {
-                t.delay_call( 3, function() {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    t.ok( wnd.mapper.getCenter().lat > wnd.centerLL.lat, "Pan up works correctly" );
+                    t.ok(!flag.mousedown, "mousedown does not get to the map");
+                    t.ok(!flag.mouseup, "mouseup does not get to the map");
+                    t.ok(!flag.click, "click does not get to the map");
+                    t.ok(!flag.dblclick, "dblclick does not get to the map");
+                    resetFlags();
-
-                    simulateClick(wnd, wnd.control.buttons[1]);
-                    t.ok( wnd.mapper.getCenter().lon < wnd.centerLL.lon, "Pan left works correctly" );
+                    t.ok(!flag.mousedown, "mousedown does not get to the map");
+                    t.ok(!flag.mouseup, "mouseup does not get to the map");
+                    t.ok(!flag.click, "click does not get to the map");
+                    t.ok(!flag.dblclick, "dblclick does not get to the map");
+                    resetFlags();
-
-                    simulateClick(wnd, wnd.control.buttons[2]);
-                    t.ok( wnd.mapper.getCenter().lon == wnd.centerLL.lon, "Pan right works correctly" );
+                    t.ok(!flag.mousedown, "mousedown does not get to the map");
+                    t.ok(!flag.mouseup, "mouseup does not get to the map");
+                    t.ok(!flag.click, "click does not get to the map");
+                    t.ok(!flag.dblclick, "dblclick does not get to the map");
+                    resetFlags();
-
-                    simulateClick(wnd, wnd.control.buttons[3]);
-                    t.ok( wnd.mapper.getCenter().lat == wnd.centerLL.lat, "Pan down works correctly" );
+                    t.ok(!flag.mousedown, "mousedown does not get to the map");
+                    t.ok(!flag.mouseup, "mouseup does not get to the map");
+                    t.ok(!flag.click, "click does not get to the map");
+                    t.ok(!flag.dblclick, "dblclick does not get to the map");
+                    resetFlags();
-
-                    simulateClick(wnd, wnd.control.buttons[4]);
-                    t.eq( wnd.mapper.getZoom(), 6, "zoomin works correctly" );
+                    t.ok(!flag.mousedown, "mousedown does not get to the map");
+                    t.ok(!flag.mouseup, "mouseup does not get to the map");
+                    t.ok(!flag.click, "click does not get to the map");
+                    t.ok(!flag.dblclick, "dblclick does not get to the map");
+                    resetFlags();
-
-                    simulateClick(wnd, wnd.control.buttons[6]);
-                    t.eq( wnd.mapper.getZoom(), 5, "zoomout works correctly" );
+                    t.ok(!flag.mousedown, "mousedown does not get to the map");
+                    t.ok(!flag.mouseup, "mouseup does not get to the map");
+                    t.ok(!flag.click, "click does not get to the map");
+                    t.ok(!flag.dblclick, "dblclick does not get to the map");
+                    resetFlags();
-
-                    simulateClick(wnd, wnd.control.buttons[5]);
-                    t.eq( wnd.mapper.getZoom(), 2, "zoomworld works correctly" );
+                    t.ok(!flag.mousedown, "mousedown does not get to the map");
+                    t.ok(!flag.mouseup, "mouseup does not get to the map");
+                    t.ok(!flag.click, "click does not get to the map");
+                    t.ok(!flag.dblclick, "dblclick does not get to the map");
+                    resetFlags();
+                    
-                });
-            });
@@ -68 +123 @@
-      var evt = wnd.document.createEvent("MouseEvents");
-      evt.initMouseEvent("mousedown", true, true, wnd, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-