diff options
| author | Stephen Blott | 2016-09-17 11:05:22 +0100 |
|---|---|---|
| committer | Stephen Blott | 2016-09-17 11:05:22 +0100 |
| commit | c9369c3e34490afdfa39c6f9520ee24367c0eacd (patch) | |
| tree | 1037e5145571787cc7f382393b2229538b0644f3 /background_scripts | |
| parent | 0006776fecdd5eb02da8973ae6856824c090c82e (diff) | |
| parent | 9f0ec8cd06903fc25d65b0b82cf8e5fb4e9f5c7a (diff) | |
| download | vimium-c9369c3e34490afdfa39c6f9520ee24367c0eacd.tar.bz2 | |
Merge branch 'gdh1995-backspace-as-go-back'
Diffstat (limited to 'background_scripts')
| -rw-r--r-- | background_scripts/commands.coffee | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/background_scripts/commands.coffee b/background_scripts/commands.coffee index c334cf9d..f865131d 100644 --- a/background_scripts/commands.coffee +++ b/background_scripts/commands.coffee @@ -41,7 +41,7 @@ Commands = # them you have to press "shift" as well. normalizeKey: (key) -> key.replace(/<[acm]-/ig, (match) -> match.toLowerCase()) - .replace(/<([acm]-)?([a-zA-Z0-9]{2,5})>/g, (match, optionalPrefix, keyName) -> + .replace(/<([acm]-)?([a-zA-Z0-9]{2,})>/g, (match, optionalPrefix, keyName) -> "<" + (if optionalPrefix then optionalPrefix else "") + keyName.toLowerCase() + ">") parseCustomKeyMappings: (customKeyMappings) -> @@ -97,7 +97,7 @@ Commands = # Keys are either literal characters, or "named" - for example <a-b> (alt+b), <left> (left arrow) or <f12> # This regular expression captures two groups: the first is a named key, the second is the remainder of # the string. - namedKeyRegex = /^(<(?:[amc]-.|(?:[amc]-)?[a-z0-9]{2,5})>)(.*)$/ + namedKeyRegex = /^(<(?:[amc]-.|(?:[amc]-)?[a-z0-9]{2,})>)(.*)$/ keyStateMapping = {} for own keys, registryEntry of @keyToCommandRegistry currentMapping = keyStateMapping |