aboutsummaryrefslogtreecommitdiffstats
path: root/lib/keyboardUtils.js
diff options
context:
space:
mode:
authorilya2010-06-29 21:26:19 -0700
committerilya2010-06-29 21:26:19 -0700
commit1170937361576c377530d436055fd2dd3b1f0f11 (patch)
tree6b6608f81cbe5e4e0a976f47e84955bc95ae3d96 /lib/keyboardUtils.js
parent24ba4c55cb1cc70dddb1bcde7e8b2d8b20c97805 (diff)
parent49f84f7495b78825f332a095517eeecec2b225b5 (diff)
downloadvimium-1170937361576c377530d436055fd2dd3b1f0f11.tar.bz2
Merge branch 'branden'
Conflicts: CREDITS lib/keyboardUtils.js
Diffstat (limited to 'lib/keyboardUtils.js')
-rw-r--r--lib/keyboardUtils.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/keyboardUtils.js b/lib/keyboardUtils.js
index 27ad5e42..98725d95 100644
--- a/lib/keyboardUtils.js
+++ b/lib/keyboardUtils.js
@@ -1,7 +1,6 @@
-var keyCodes = { ESC: 27, backspace: 8, deleteKey: 46, enter: 13, space: 32, f1: 112, f12: 123};
+var keyCodes = { ESC: 27, backspace: 8, deleteKey: 46, enter: 13, space: 32, shiftKey: 16, f1: 112, f12: 123};
var keyNames = { 37: "left", 38: "up", 39: "right", 40: "down" }
-
// This is a mapping of the incorrect keyIdentifiers generated by Webkit on Windows during keydown events to
// the correct identifiers, which are correctly generated on Mac. We require this mapping to properly handle
// these keys on Windows. See https://bugs.webkit.org/show_bug.cgi?id=19906 for more details.