aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--vimiumFrontend.js20
1 files changed, 9 insertions, 11 deletions
diff --git a/vimiumFrontend.js b/vimiumFrontend.js
index a28d0810..8cadff31 100644
--- a/vimiumFrontend.js
+++ b/vimiumFrontend.js
@@ -246,14 +246,19 @@ function onKeydown(event) {
if (keyChar != "") // Again, ignore just modifiers. Maybe this should replace the keyCode > 31 condition.
{
+ var modifiers = [];
+
if (event.shiftKey)
keyChar = keyChar.toUpperCase();
- if (event.ctrlKey)
- keyChar = prependModifier("c", keyChar);
if (event.metaKey)
- keyChar = prependModifier("m", keyChar);
+ modifiers.push("m");
+ if (event.ctrlKey)
+ modifiers.push("c");
if (event.altKey)
- keyChar = prependModifier("a", keyChar);
+ modifiers.push("a");
+
+ for (var i in modifiers)
+ keyChar = modifiers[i] + "-" + keyChar;
}
}
@@ -306,13 +311,6 @@ function onKeydown(event) {
}
}
-function prependModifier(modifier, keyChar) {
- if (keyChar.search(hasModifiersRegex) == 0)
- return "<" + modifier + "-" + keyChar.slice(1, keyChar.length - 1) + ">";
- else
- return "<" + modifier + "-" + keyChar + ">";
-}
-
function refreshCompletionKeys(completionKeys) {
if (completionKeys)
currentCompletionKeys = completionKeys;