aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Blott2016-10-10 13:27:32 +0100
committerStephen Blott2016-10-10 13:28:15 +0100
commitc5e26d75cb8525ba34f6f54f1a1c041df66075e3 (patch)
tree3d99ccb76e3f0ee9ef3132c49ae5e165dcf30a8f
parent1df19294c544b897bf5fe52401050dd43b69129d (diff)
downloadvimium-c5e26d75cb8525ba34f6f54f1a1c041df66075e3.tar.bz2
Rename 'translate' to 'mapkey'.
-rw-r--r--background_scripts/commands.coffee8
-rw-r--r--content_scripts/mode_key_handler.coffee8
-rw-r--r--lib/keyboard_utils.coffee6
3 files changed, 11 insertions, 11 deletions
diff --git a/background_scripts/commands.coffee b/background_scripts/commands.coffee
index 17c05f90..d12b704d 100644
--- a/background_scripts/commands.coffee
+++ b/background_scripts/commands.coffee
@@ -9,7 +9,7 @@ Commands =
@clearKeyMappingsAndSetDefaults()
@parseCustomKeyMappings customKeyMappings
@generateKeyStateMapping()
- chrome.storage.local.set keyTranslationRegistry: @keyTranslationRegistry
+ chrome.storage.local.set mapKeyRegistry: @mapKeyRegistry
availableCommands: {}
keyToCommandRegistry: {}
@@ -85,11 +85,11 @@ Commands =
when "unmapAll"
@keyToCommandRegistry = {}
- when "translate"
+ when "mapkey"
if tokens.length == 3
fromChar = @parseKeySequence tokens[1]
toChar = @parseKeySequence tokens[2]
- @keyTranslationRegistry[fromChar[0]] = toChar[0] if fromChar.length == toChar.length == 1
+ @mapKeyRegistry[fromChar[0]] = toChar[0] if fromChar.length == toChar.length == 1
# Push the key mapping for passNextKey into Settings so that it's available in the front end for insert
# mode. We exclude single-key mappings (that is, printable keys) because when users press printable keys
@@ -116,7 +116,7 @@ Commands =
clearKeyMappingsAndSetDefaults: ->
@keyToCommandRegistry = {}
- @keyTranslationRegistry = {}
+ @mapKeyRegistry = {}
for own key, command of defaultKeyMappings
keySequence = @parseKeySequence key
key = keySequence.join ""
diff --git a/content_scripts/mode_key_handler.coffee b/content_scripts/mode_key_handler.coffee
index 9f8206fb..480a79af 100644
--- a/content_scripts/mode_key_handler.coffee
+++ b/content_scripts/mode_key_handler.coffee
@@ -33,12 +33,12 @@ class KeyHandlerMode extends Mode
# We cannot track keyup events if we lose the focus.
blur: (event) => @alwaysContinueBubbling => @keydownEvents = {} if event.target == window
- @keyTranslationRegistry = {}
- Utils.monitorChromeStorage "keyTranslationRegistry", (value) => @keyTranslationRegistry = value
+ @mapKeyRegistry = {}
+ Utils.monitorChromeStorage "mapKeyRegistry", (value) => @mapKeyRegistry = value
onKeydown: (event) ->
keyChar = KeyboardUtils.getKeyCharString event
- keyChar = @keyTranslationRegistry[keyChar] ? keyChar
+ keyChar = @mapKeyRegistry[keyChar] ? keyChar
isEscape = KeyboardUtils.isEscape event
if isEscape and (@countPrefix != 0 or @keyState.length != 1)
@keydownEvents[event.keyCode] = true
@@ -65,7 +65,7 @@ class KeyHandlerMode extends Mode
onKeypress: (event) ->
keyChar = KeyboardUtils.getKeyCharString event
- keyChar = @keyTranslationRegistry[keyChar] ? keyChar
+ keyChar = @mapKeyRegistry[keyChar] ? keyChar
if @isMappedKey keyChar
@handleKeyChar keyChar
else if @isCountKey keyChar
diff --git a/lib/keyboard_utils.coffee b/lib/keyboard_utils.coffee
index c8591c3c..967baba8 100644
--- a/lib/keyboard_utils.coffee
+++ b/lib/keyboard_utils.coffee
@@ -80,14 +80,14 @@ KeyboardUtils =
isPrimaryModifierKey: (event) -> if (@platform == "Mac") then event.metaKey else event.ctrlKey
isEscape: do ->
- keyTranslationRegistry = {}
+ mapKeyRegistry = {}
# NOTE: "?" here for the tests.
- Utils?.monitorChromeStorage "keyTranslationRegistry", (value) => keyTranslationRegistry = value
+ Utils?.monitorChromeStorage "mapKeyRegistry", (value) => mapKeyRegistry = value
(event) ->
event.keyCode == @keyCodes.ESC || do =>
keyChar = @getKeyCharString event, true
- keyChar = keyTranslationRegistry[keyChar] ? keyChar
+ keyChar = mapKeyRegistry[keyChar] ? keyChar
# <c-[> is mapped to Escape in Vim by default.
keyChar == "<c-[>"