Ticket #1292: keyboard_2.patch

tests/Control/KeyboardDefaults.html

@@ -23 +23 @@
-                "new OpenLayers.Map creates map" );
-        map.addControl(control);
-        t.ok( control.map === map, "Control.map is set to the map object" );
-map.controls[3] === control
+OpenLayers.Util.indexOf(map.controls, control)
-    }
-
+    /* When interpretting
+     * the keycodes below (including the comments associated with them),
+     * consult the URL below. For instance, the Safari browser returns
+     * "IE keycodes", and so is supported by any keycode labeled "IE".
+     * 
+     * Very informative URL:
+     *    http://unixpapa.com/js/key.html
+     */
-    function test_Control_KeyboardDefaults_KeyDownEvent (t) {
-0
+6
-
-        var evt = {which: 1};
-        map = new OpenLayers.Map('map');
@@ -38 +46 @@
-        control = new OpenLayers.Control.KeyboardDefaults();
-        map.addControl(control);
-        
+        var STARTING_ZOOM_LEVEL = 4;
+        
-        var centerLL = new OpenLayers.LonLat(0,0);
-4
+ STARTING_ZOOM_LEVEL
-
-
+
-        evt.keyCode = OpenLayers.Event.KEY_LEFT;
-Down
+Press
-        t.delay_call( 
-1
+2
-                t.ok( map.getCenter().lon < centerLL.lon, "key left works correctly" );
+                
+                // Start new test.
-                evt.keyCode = OpenLayers.Event.KEY_RIGHT;
-Down
+Press
-            },
-
-
+
+
+
+
-                evt.keyCode = OpenLayers.Event.KEY_UP;
-Down
+Press
-            },
-1
+2
-                t.ok( map.getCenter().lat > centerLL.lat, "key up works correctly" ); 
+                
+                // Start new test.
-                evt.keyCode = OpenLayers.Event.KEY_DOWN;
-Down
+Press
-            },
-1
+2
-                t.ok( map.getCenter().lat == centerLL.lat, "key down works correctly" ); 
+                
+                // Start new test.
-                evt.keyCode = 33; //page up
-Down
+Press
-            },
-1
+2
-                t.ok( map.getCenter().lat > centerLL.lat, "key page up works correctly" ); 
+                
+                // Start new test.
-                evt.keyCode = 34; //page down
-Down
+Press
-            },
-1
+2
-                t.ok( map.getCenter().lat == centerLL.lat, "key page down works correctly" ); 
+                
+                // Start new test.
-                evt.keyCode = 35; //end
-Down
+Press
-            },
-1
+2
-                t.ok( map.getCenter().lon > centerLL.lon, "key end works correctly" ); 
-
-
+
+
+
+
-            },
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                // set zoomanimation flag manually,
-                // reason: loadend event in layers.js will not achieved in unittests
-                map.zoomanimationActive = false;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        );
-    }

tests/Control/ModifyFeature.html

@@ -67 +67 @@
-        t.eq(control.deleteCodes[0], 46, "Delete code properly turned into an array.");
-        var control = new OpenLayers.Control.ModifyFeature(layer);
-        t.eq(control.deleteCodes[0], 46, "Default deleteCodes include delete"); 
-100
+68
-        
-        control.destroy();
-        layer.destroy();
@@ -123 +123 @@
-                 "vertex deletion: onModification called with the proper feature");
-        };
-        // run the above four tests twice
-delKey
-dKey
+{keyCode:delKey}
+{keyCode:dKey}
-
-        // now make sure nothing happens if the vertex is mid-drag
-        control.dragControl.handlers.drag.dragging = true;
-delKey
+{keyCode:delKey}
-
-        //  clean up
-        control.destroy();
@@ -428 +428 @@
-        };
-        point.geometry.parent = poly.geometry;
-        control.dragControl.feature = point;
-46
+{keyCode:46}
-        layer.drawFeature = oldDraw;
-        
-        map.destroy();

tests/list-tests.html

@@ -91 +91 @@
-    <li>Control/DragFeature.html</li>
-    <li>Control/DragPan.html</li>
-    <li>Control/DrawFeature.html</li>
+    <li>Control/KeyboardDefaults.html</li>
-    <li>Control/LayerSwitcher.html</li>
-    <li>Control/ModifyFeature.html</li>
-    <li>Control/MousePosition.html</li>

lib/OpenLayers/Control/KeyboardDefaults.js

@@ -47 +47 @@
-     */
-    draw: function() {
-        this.handler = new OpenLayers.Handler.Keyboard( this, { 
-press
+down
-        this.activate();
-    },
-    
-    /**
-     * Method: defaultKeyPress
+     * When handling the key event, we only use evt.keyCode. This holds 
+     * some drawbacks, though we get around them below. When interpretting
+     * the keycodes below (including the comments associated with them),
+     * consult the URL below. For instance, the Safari browser returns
+     * "IE keycodes", and so is supported by any keycode labeled "IE".
+     * 
+     * Very informative URL:
+     *    http://unixpapa.com/js/key.html
-     *
-     * Parameters:
-     * code - {Integer} 
-     */
-code
-c
+evt
+evt.keyC
-            case OpenLayers.Event.KEY_LEFT:
-                this.map.pan(-this.slideFactor, 0);
-                break;
@@ -72 +80 @@
-                this.map.pan(0, this.slideFactor);
-                break;
-            
-  
+. Same in all browsers.
-                var size = this.map.getSize();
-                this.map.pan(0, -0.75*size.h);
-                break;
-  
+. Same in all browsers.
-                var size = this.map.getSize();
-                this.map.pan(0, 0.75*size.h);
-                break; 
-  
+. Same in all browsers.
-                var size = this.map.getSize();
-                this.map.pan(0.75*size.w, 0);
-                break; 
-Pos1  
+Home. Same in all browsers.
-                var size = this.map.getSize();
-                this.map.pan(-0.75*size.w, 0);
-                break; 
-
-
+
+
+
+
-                this.map.zoomIn();
-                break; 
-
+
+
+
+
-                this.map.zoomOut();
-                break; 
-            case 107: // + (IE only)
-                this.map.zoomIn();
-                break;
-            case 109: // - (IE only)
-                this.map.zoomOut();
-                break;
-        } 
-    },
-

lib/OpenLayers/Control/ModifyFeature.js

@@ -93 +93 @@
-     * {Array(Integer)} Keycodes for deleting verticies.  Set to null to disable
-     *     vertex deltion by keypress.  If non-null, keypresses with codes
-     *     in this array will delete vertices under the mouse. Default
-100
+68
-     */
-    deleteCodes: null,
-
@@ -183 +183 @@
-            this.layer.style || this.layer.styleMap.createSymbolizer());
-        this.virtualStyle.fillOpacity = 0.3;
-        this.virtualStyle.strokeOpacity = 0.3;
-100
+68
-        this.mode = OpenLayers.Control.ModifyFeature.RESHAPE;
-        OpenLayers.Control.prototype.initialize.apply(this, [options]);
-        if(!(this.deleteCodes instanceof Array)) {
@@ -227 +227 @@
-
-        // configure the keyboard handler
-        var keyboardOptions = {
-press
+down
-        };
-        this.handlers = {
-            keyboard: new OpenLayers.Handler.Keyboard(this, keyboardOptions)
@@ -517 +517 @@
-     * Parameters:
-     * {Integer} Key code corresponding to the keypress event.
-     */
-
+
+
+
-        // check for delete key
-        if(this.feature &&
-           OpenLayers.Util.indexOf(this.deleteCodes, code) != -1) {

lib/OpenLayers/Handler/Keyboard.js

@@ -24 +24 @@
-     * Constant: KEY_EVENTS
-     * keydown, keypress, keyup
-     */
-press", "key
+
-
-    /** 
-    * Property: eventListener
@@ -72 +72 @@
-        if (OpenLayers.Handler.prototype.activate.apply(this, arguments)) {
-            for (var i=0, len=this.KEY_EVENTS.length; i<len; i++) {
-                OpenLayers.Event.observe(
-window
+document
-            }
-            return true;
-        } else {
@@ -88 +88 @@
-        if (OpenLayers.Handler.prototype.deactivate.apply(this, arguments)) {
-            for (var i=0, len=this.KEY_EVENTS.length; i<len; i++) {
-                OpenLayers.Event.stopObserving(
-window
+document
-            }
-            deactivated = true;
-        }
@@ -100 +100 @@
-     */
-    handleKeyEvent: function (evt) {
-        if (this.checkModifiers(evt)) {
-.charCode || evt.keyCode
+
-        }
-    },
-