Changeset 6462

Timestamp:

03/07/08 18:04:32 (6 months ago)

Author:

crschmidt

Message:

Add improved navigation control support for disabling zooming with the
mousewheel. Original from sbenthall (yay), example and more code from me, tests
from elem. r=elemoine. (Closes #1339)

Files:

• trunk/openlayers/examples/navigation-control.html (added)
• trunk/openlayers/lib/OpenLayers/Control/Navigation.js (modified) (3 diffs)
• trunk/openlayers/tests/Control/test_Navigation.html (modified) (1 diff)

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

@@ -38 +38 @@
-
-    /**
+     * APIProperty: zoomWheelEnabled
+     * {Boolean} Whether the mousewheel should zoom the map
+     */
+    zoomWheelEnabled: true, 
+
+    /**
-     * Constructor: OpenLayers.Control.Navigation
-     * Create a new navigation control
@@ -76 +82 @@
-    activate: function() {
-        this.dragPan.activate();
-
+
+
+
-        this.handlers.click.activate();
-        this.zoomBox.activate();
@@ -169 +177 @@
-        this.wheelChange(evt, -1);
-    },
+    
+    /**
+     * Method: disableZoomWheel
+     */
+    
+    disableZoomWheel : function() {
+        this.zoomWheelEnabled = false;
+        this.handlers.wheel.deactivate();       
+    },
+    
+    /**
+     * Method: enableZoomWheel
+     */
+    
+    enableZoomWheel : function() {
+        this.zoomWheelEnabled = true;
+        if (this.active) {
+            this.handlers.wheel.activate();
+        }    
+    },
-
-    CLASS_NAME: "OpenLayers.Control.Navigation"

trunk/openlayers/tests/Control/test_Navigation.html

@@ -70 +70 @@
-    }
-
+    function test_Control_Navigation_disableZoomWheel(t) {
+        t.plan(2);
+        var nav = new OpenLayers.Control.Navigation();
+        var wheel = new OpenLayers.Handler.MouseWheel(nav, {});
+        nav.handlers.wheel = wheel;
+        wheel.register = function() {};
+        wheel.unregister = function() {};
+        wheel.activate();
+        nav.disableZoomWheel();
+        t.eq(nav.zoomWheelEnabled, false, "mouse wheel deactivated");
+        t.eq(wheel.active, false, "mouse wheel handler deactivated");
+    }
+
+    function test_Control_Navigation_enableZoomWheel(t) {
+        t.plan(2);
+        var nav = new OpenLayers.Control.Navigation({zoomWheelEnabled: false});
+        nav.active = true;
+        var wheel = new OpenLayers.Handler.MouseWheel(nav, {});
+        wheel.register = function() {};
+        wheel.unregister = function() {};
+        nav.handlers.wheel = wheel;
+        nav.enableZoomWheel();
+        t.eq(nav.zoomWheelEnabled, true, "mouse wheel activated");
+        t.eq(wheel.active, true, "mouse wheel handler activated");
+    }
+
-  </script>
-</head>