diff options
| author | Phil Crosby | 2012-04-29 21:44:49 -0700 |
|---|---|---|
| committer | Phil Crosby | 2012-04-29 21:44:49 -0700 |
| commit | 1abee7d66f68da2b48d88832eea4e2d045cc1b0b (patch) | |
| tree | 553253eae4e993b686ea1aa812776d9601416248 | |
| parent | e81f8c7e82611d5ee7e32dec6a3a0bdc546da414 (diff) | |
| download | vimium-1abee7d66f68da2b48d88832eea4e2d045cc1b0b.tar.bz2 | |
Use keycodes object
| -rw-r--r-- | fuzzyMode.js | 9 | ||||
| -rw-r--r-- | lib/keyboardUtils.js | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/fuzzyMode.js b/fuzzyMode.js index c7b5b082..4d5d176d 100644 --- a/fuzzyMode.js +++ b/fuzzyMode.js @@ -71,16 +71,15 @@ var fuzzyMode = (function() { if (isEscape(event)) { this.hide(); } - // move selection with Up/Down, Tab/Shift-Tab, Ctrl-k/Ctrl-j - else if (keyChar === 'up' || (event.keyCode == 9 && event.shiftKey) - || (keyChar === 'k' && event.ctrlKey)) { + else if (keyChar === "up" || (event.keyCode == keyCodes.tab && event.shiftKey) + || (keyChar === "k" && event.ctrlKey)) { if (this.selection > 0) this.selection -= 1; this.updateSelection(); } - else if (keyChar === 'down' || (event.keyCode == 9 && !event.shiftKey) - || (keyChar === 'j' && isPrimaryModifierKey(event))) { + else if (keyChar === "down" || (event.keyCode == keyCodes.tab && !event.shiftKey) + || (keyChar === "j" && isPrimaryModifierKey(event))) { if (this.selection < this.completions.length - 1) this.selection += 1; this.updateSelection(); diff --git a/lib/keyboardUtils.js b/lib/keyboardUtils.js index 84e860ba..52544c73 100644 --- a/lib/keyboardUtils.js +++ b/lib/keyboardUtils.js @@ -1,4 +1,6 @@ -var keyCodes = { ESC: 27, backspace: 8, deleteKey: 46, enter: 13, space: 32, shiftKey: 16, f1: 112, f12: 123}; +var keyCodes = { + ESC: 27, backspace: 8, deleteKey: 46, enter: 13, space: 32, shiftKey: 16, f1: 112, f12: 123, tab: 9 +}; 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 |