Moving some files around/creating new ace/keyboard directory. Renaming KeyboardStateMapper to StateMapper

demo/demo_startup.js

@@ -55,8 +55,8 @@ exports.launch = function(env) {
     var TextMode = require("ace/mode/text").Mode;
     var UndoManager = require("ace/undomanager").UndoManager;
 
-    var vim = require("ace/mode/vim");
-    var emacs = require("ace/mode/emacs");
+    var vim = require("ace/keyboard/vim").Vim;
+    var emacs = require("ace/keyboard/emacs").Emacs;
 
     var docs = {};
 

lib/ace/editor.js

@@ -40,8 +40,8 @@ define(function(require, exports, module) {
 var oop = require("pilot/oop");
 var event = require("pilot/event");
 var lang = require("pilot/lang");
-var TextInput = require("ace/textinput").TextInput;
-var KeyBinding = require("ace/keybinding").KeyBinding;
+var TextInput = require("ace/keyboard/textinput").TextInput;
+var KeyBinding = require("ace/keyboard/keybinding").KeyBinding;
 var Document = require("ace/document").Document;
 var Search = require("ace/search").Search;
 var BackgroundTokenizer = require("ace/background_tokenizer").BackgroundTokenizer;

lib/ace/keyboard/emacs.js

@@ -37,8 +37,8 @@
 
 define(function(require, exports, module) {
 
-var KeyboardStateMapper = require("ace/keyboardstate").KeyboardStateMapper;
-var matchCharacterOnly =  require("ace/keyboardstate").matchCharacterOnly;
+var StateHandler = require("ace/keyboard/state_handler").StateHandler;
+var matchCharacterOnly =  require("ace/keyboard/state_handler").matchCharacterOnly;
 
 var emacsState = {
     start: [
@@ -144,9 +144,6 @@ var emacsState = {
     ]
 };
 
-var emacsKeyboardStateMapper = new KeyboardStateMapper(emacsState);
+exports.Emacs = new StateHandler(emacsState);
 
-exports.handleKeyboard = function(data, hashId, key, e) {
-    return emacsKeyboardStateMapper.match(data, hashId, key);
-}
 });

lib/ace/keyboard/state_handler.js

@@ -41,11 +41,11 @@ define(function(require, exports, module) {
 // on, then enable debugging.
 var DEBUG = false;
 
-function KeyboardStateMapper(keymapping) {
+function StateHandler(keymapping) {
     this.keymapping = this.$buildKeymappingRegex(keymapping);
 }
 
-KeyboardStateMapper.prototype = {
+StateHandler.prototype = {
     /**
      * Build the RegExp from the keymapping as RegExp can't stored directly
      * in the metadata JSON and as the RegExp used to match the keys/buffer
@@ -190,7 +190,10 @@ KeyboardStateMapper.prototype = {
         }
     },
 
-    match: function(data, hashId, key) {
+    /**
+     * This function is called by keyBinding.
+     */
+    handleKeyboard: function(data, hashId, key) {
         // Compute the current value of the keyboard input buffer.
         var r = this.$composeBuffer(data, hashId, key);
         var buffer = r.bufferToUse;
@@ -232,5 +235,5 @@ exports.matchCharacterOnly = function(buffer, hashId, key, symbolicName) {
     }
 };
 
-exports.KeyboardStateMapper = KeyboardStateMapper;
+exports.StateHandler = StateHandler;
 });

lib/ace/keyboard/vim.js

@@ -37,8 +37,8 @@
 
 define(function(require, exports, module) {
 
-var KeyboardStateMapper = require("ace/keyboardstate").KeyboardStateMapper;
-var matchCharacterOnly =  require("ace/keyboardstate").matchCharacterOnly;
+var StateHandler = require("ace/keyboard/state_handler").StateHandler;
+var matchCharacterOnly =  require("ace/keyboard/state_handler").matchCharacterOnly;
 
 var vimStates = {
     start: [
@@ -107,9 +107,6 @@ var vimStates = {
     ]
 };
 
-var vimKeyboardStateMapper = new KeyboardStateMapper(vimStates);
+exports.Vim = new StateHandler(vimStates);
 
-exports.handleKeyboard = function(data, hashId, key, e) {
-    return vimKeyboardStateMapper.match(data, hashId, key);
-}
 });