Merge pull request #115 from jimevans/sendkeys_fixes

Adding support for NULL key.
detro · Nov 3, 2012 · 222458f · 222458f
2 parents 714f774 + 1380c87
commit 222458f
Showing 1 changed file with 18 additions and 14 deletions.
diff --git a/src/inputs.js b/src/inputs.js
@@ -215,22 +215,26 @@ ghostdriver.Inputs = function () {
             var key = keys[i];
             var actualKey = _translateKey(session, key);
 
-            if (_isModifierKey(key)) {
+            if (key === '\uE000') {
-                if (_isModifierKeyPressed(key)) {
+                _clearModifierKeys(session);
-                    _keyUp(session, actualKey);
-                } else {
-                    _keyDown(session, actualKey);
-                }
             } else {
-                if (_implicitShiftKeys.hasOwnProperty(actualKey)) {
+                if (_isModifierKey(key)) {
-                    session.getCurrentWindow().sendEvent("keydown", _translateKey(session, "\uE008"));
+                    if (_isModifierKeyPressed(key)) {
-                    _pressKey(session, actualKey);
+                        _keyUp(session, actualKey);
-                    session.getCurrentWindow().sendEvent("keyup", _translateKey(session, "\uE008"));
-                } else {
-                    if ((_currentModifierKeys & _modifierKeyValues.SHIFT) && _shiftKeys.hasOwnProperty(actualKey)) {
-                        _pressKey(session, _shiftKeys[actualKey]);
                     } else {
+                        _keyDown(session, actualKey);
+                    }
+                } else {
+                    if (_implicitShiftKeys.hasOwnProperty(actualKey)) {
+                        session.getCurrentWindow().sendEvent("keydown", _translateKey(session, "\uE008"));
                         _pressKey(session, actualKey);
+                        session.getCurrentWindow().sendEvent("keyup", _translateKey(session, "\uE008"));
+                    } else {
+                        if ((_currentModifierKeys & _modifierKeyValues.SHIFT) && _shiftKeys.hasOwnProperty(actualKey)) {
+                            _pressKey(session, _shiftKeys[actualKey]);
+                        } else {
+                            _pressKey(session, actualKey);
+                        }
                     }
                 }
             }
@@ -286,14 +290,14 @@ ghostdriver.Inputs = function () {
     },
 
     _keyUp = function (session, key) {
-        _keyEvent(session, "keyup", key);
         if (key == _translateKey(session, "\uE008")) {
             _updateModifierKeys(_modifierKeyValues.SHIFT, false);
         } else if (key == _translateKey(session, "\uE009")) {
             _updateModifierKeys(_modifierKeyValues.CONTROL, false);
         } else if (key == _translateKey(session, "\uE00A")) {
             _updateModifierKeys(_modifierKeyValues.ALT, false);
         }
+        _keyEvent(session, "keyup", key);
     },
 
     _mouseClick = function (session, coords) {