1 files changed, 58 insertions, 53 deletions
diff --git a/commands.js b/commands.js
index cc774bff..8a16e969 100644
--- a/commands.js
+++ b/commands.js
@@ -81,59 +81,64 @@ function parseCustomKeyMappings(customKeyMappings) {
 function clearKeyMappingsAndSetDefaults() {
   keyToCommandRegistry = {};
 
-  mapKeyToCommand("?", "showHelp");
-  mapKeyToCommand("j", "scrollDown");
-  mapKeyToCommand("k", "scrollUp");
-  mapKeyToCommand("h", "scrollLeft");
-  mapKeyToCommand("l", "scrollRight");
-  mapKeyToCommand("gg", "scrollToTop");
-  mapKeyToCommand("G", "scrollToBottom");
-  mapKeyToCommand("zH", "scrollToLeft");
-  mapKeyToCommand("zL", "scrollToRight");
-  mapKeyToCommand("<c-e>", "scrollDown");
-  mapKeyToCommand("<c-y>", "scrollUp");
-  mapKeyToCommand("<c-d>", "scrollPageDown");
-  mapKeyToCommand("<c-u>", "scrollPageUp");
-  mapKeyToCommand("<c-f>", "scrollFullPageDown");
-  mapKeyToCommand("<c-b>", "scrollFullPageUp");
-  mapKeyToCommand("r", "reload");
-  mapKeyToCommand("gs", "toggleViewSource");
-
-  mapKeyToCommand("i", "enterInsertMode");
-
-  mapKeyToCommand("H", "goBack");
-  mapKeyToCommand("L", "goForward");
-  mapKeyToCommand("gu", "goUp");
-
-  mapKeyToCommand("zi", "zoomIn");
-  mapKeyToCommand("zo", "zoomOut");
-  mapKeyToCommand("z0", "zoomReset");
-
-  mapKeyToCommand("gi", "focusInput");
-
-  mapKeyToCommand("f",     "activateLinkHintsMode");
-  mapKeyToCommand("F",     "activateLinkHintsModeToOpenInNewTab");
-  mapKeyToCommand("<a-f>", "activateLinkHintsModeWithQueue");
-
-  mapKeyToCommand("/", "enterFindMode");
-  mapKeyToCommand("n", "performFind");
-  mapKeyToCommand("N", "performBackwardsFind");
-
-  mapKeyToCommand("[[", "goPrevious");
-  mapKeyToCommand("]]", "goNext");
-
-  mapKeyToCommand("yy", "copyCurrentUrl");
-
-  mapKeyToCommand("K", "nextTab");
-  mapKeyToCommand("J", "previousTab");
-  mapKeyToCommand("gt", "nextTab");
-  mapKeyToCommand("gT", "previousTab");
-
-  mapKeyToCommand("t", "createTab");
-  mapKeyToCommand("d", "removeTab");
-  mapKeyToCommand("u", "restoreTab");
-
-  mapKeyToCommand("gf", "nextFrame");
+  var defaultKeyMappings = {
+    "?": "showHelp",
+    "j": "scrollDown",
+    "k": "scrollUp",
+    "h": "scrollLeft",
+    "l": "scrollRight",
+    "gg": "scrollToTop",
+    "G": "scrollToBottom",
+    "zH": "scrollToLeft",
+    "zL": "scrollToRight",
+    "<c-e>": "scrollDown",
+    "<c-y>": "scrollUp",
+    "<c-d>": "scrollPageDown",
+    "<c-u>": "scrollPageUp",
+    "<c-f>": "scrollFullPageDown",
+    "<c-b>": "scrollFullPageUp",
+    "r": "reload",
+    "gs": "toggleViewSource",
+
+    "i": "enterInsertMode",
+
+    "H": "goBack",
+    "L": "goForward",
+    "gu": "goUp",
+
+    "zi": "zoomIn",
+    "zo": "zoomOut",
+    "z0": "zoomReset",
+
+    "gi": "focusInput",
+
+    "f":     "activateLinkHintsMode",
+    "F":     "activateLinkHintsModeToOpenInNewTab",
+    "<a-f>": "activateLinkHintsModeWithQueue",
+
+    "/": "enterFindMode",
+    "n": "performFind",
+    "N": "performBackwardsFind",
+
+    "[[": "goPrevious",
+    "]]": "goNext",
+
+    "yy": "copyCurrentUrl",
+
+    "K": "nextTab",
+    "J": "previousTab",
+    "gt": "nextTab",
+    "gT": "previousTab",
+
+    "t": "createTab",
+    "d": "removeTab",
+    "u": "restoreTab",
+
+    "gf": "nextFrame"
+  };
+
+  for (var key in defaultKeyMappings)
+    mapKeyToCommand(key, defaultKeyMappings[key]);
 }
 
 // Navigating the current page: