Refactor insert mode commands.

index.html

@@ -30,6 +30,7 @@
     <script src='js/normal_mode/operators.js'></script>
     <script src='js/normal_mode/repeat.js'></script>
     <script src='js/insert_mode.js'></script>
+    <script src='js/insert_mode/commands.js'></script>
     <script src='js/demo.js'></script>
     <script>
       window.vimulator = new Vimulator.Demo().init('#vimulator');

js/insert_mode.js

@@ -1,13 +1,4 @@
 (function () {
-    var escapeCommand = new Vimulator.Command({
-        callback: function (vim) {
-            vim.setMode("normal");
-            vim.moveCursorRelative(0, -1);
-        },
-        description: function () {
-            return "<kbd>ESC</kbd> Return to normal mode";
-        }
-    });
     var C = Vimulator.Command,
         U = Vimulator.Utils;
 
@@ -20,12 +11,19 @@
         this.vim.registers["."] = "";
     };
 
+    Vimulator.InsertMode.prototype.commandList = function () {
+        this.commands = this.commands || new Vimulator.CommandList(
+            Vimulator.InsertMode.Commands
+        );
+        return this.commands;
+    };
+
     Vimulator.InsertMode.prototype.keyPress = function (key) {
         var op;
 
-        if (key === U.Keys.ESC) {
-            op = new Vimulator.Operation;
-            op.setCommand(escapeCommand);
+        if (Vimulator.InsertMode.Commands.hasOwnProperty(key)) {
+            op = new Vimulator.Operation(this.commandList());
+            op.keyPress(key);
             op.execute(this.vim);
             return op;
         } else {

js/insert_mode/commands.js

@@ -0,0 +1,16 @@
+(function () {
+    var C = Vimulator.Command,
+        U = Vimulator.Utils;
+
+    Vimulator.InsertMode.Commands = {};
+
+    Vimulator.InsertMode.Commands[U.Keys.ESC] = new C({
+        callback: function (vim) {
+            vim.setMode("normal");
+            vim.moveCursorRelative(0, -1);
+        },
+        description: function () {
+            return "Return to normal mode";
+        }
+    });
+}());

test.html

@@ -32,6 +32,7 @@
     <script src='js/normal_mode/operators.js'></script>
     <script src='js/normal_mode/repeat.js'></script>
     <script src='js/insert_mode.js'></script>
+    <script src='js/insert_mode/commands.js'></script>
     <script>
       window.vimulator = new Vimulator.Base().init('#vimulator');
     </script>