Changeset 1347

Timestamp:

08/24/06 01:01:10 (2 years ago)

Author:

crschmidt

Message:

If we choose to switch to a mode via the toolbar, don't leave that mode
until we're explicitly told to. This allows users to click the zoombox
and zoom several times.

Files:

• branches/openlayers/2.0/lib/OpenLayers/Control/MouseToolbar.js (modified) (4 diffs)

branches/openlayers/2.0/lib/OpenLayers/Control/MouseToolbar.js

@@ -49 +49 @@
-        centered = centered.add((this.direction == "vertical" ? 0 : sz.w), (this.direction == "vertical" ? sz.h : 0));
-        this.switchModeTo("pan");
-        this.map.events.register("zoomend", this, function() { this.switchModeTo("pan"); });
-        return this.div;
-        
@@ -106 +105 @@
-        this.mouseDragStart = evt.xy.clone();
-        this.performedDrag = false;
+        this.startViaKeyboard = false;
-        if (evt.shiftKey && this.mode !="zoombox") {
-            this.switchModeTo("zoombox");
+            this.startViaKeyboard = true;
-        } else if (evt.altKey && this.mode !="measure") {
-            this.switchModeTo("measure");
@@ -240 +241 @@
-        switch (this.mode) {
-            case "zoombox":
-                console.log(this.mouseDragStart, evt.xy);
-                console.log(Math.abs(this.mouseDragStart.x - evt.xy.x) > 5 ||                        Math.abs((this.mouseDragStart.y - evt.xy.y)) > 5);
-                console.log(Math.abs(this.mouseDragStart.x-evt.xy.x) > 5); 
-                console.log(Math.abs(this.mouseDragStart.y-evt.xy.y)>5); 
-                if (Math.abs(this.mouseDragStart.x - evt.xy.x) > 5 ||    
-                    Math.abs(this.mouseDragStart.y - evt.xy.y) > 5) {  
@@ -261 +258 @@
-                this.map.viewPortDiv.removeChild(document.getElementById("zoomBox"));
-                this.zoomBox = null;
-
+
+
-                break;
-            case "pan":