From 2d94d77dc4a67f70c186ead3553142b1f30c008b Mon Sep 17 00:00:00 2001
From: Julian Viereck <julian.viereck@gmail.com>
Date: Thu, 13 Jan 2011 23:12:27 +0100
Subject: [PATCH] Moving some files around/creating new ace/keyboard directory.
 Renaming KeyboardStateMapper to StateMapper

---
 demo/demo_startup.js                                  |  4 ++--
 lib/ace/editor.js                                     |  4 ++--
 lib/ace/{mode => keyboard}/emacs.js                   |  9 +++------
 lib/ace/{ => keyboard}/keybinding.js                  |  0
 .../{keyboardstate.js => keyboard/state_handler.js}   | 11 +++++++----
 lib/ace/{ => keyboard}/textinput.js                   |  0
 lib/ace/{mode => keyboard}/vim.js                     |  9 +++------
 7 files changed, 17 insertions(+), 20 deletions(-)
 rename lib/ace/{mode => keyboard}/emacs.js (93%)
 rename lib/ace/{ => keyboard}/keybinding.js (100%)
 rename lib/ace/{keyboardstate.js => keyboard/state_handler.js} (97%)
 rename lib/ace/{ => keyboard}/textinput.js (100%)
 rename lib/ace/{mode => keyboard}/vim.js (91%)

diff --git a/demo/demo_startup.js b/demo/demo_startup.js
index f7144ee0..2e0ec600 100644
--- a/demo/demo_startup.js
+++ b/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 = {};
 
diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index 5e1b7aed..fed601df 100644
--- a/lib/ace/editor.js
+++ b/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;
diff --git a/lib/ace/mode/emacs.js b/lib/ace/keyboard/emacs.js
similarity index 93%
rename from lib/ace/mode/emacs.js
rename to lib/ace/keyboard/emacs.js
index 6cbf68dc..ce0cbc06 100644
--- a/lib/ace/mode/emacs.js
+++ b/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);
-}
 });
diff --git a/lib/ace/keybinding.js b/lib/ace/keyboard/keybinding.js
similarity index 100%
rename from lib/ace/keybinding.js
rename to lib/ace/keyboard/keybinding.js
diff --git a/lib/ace/keyboardstate.js b/lib/ace/keyboard/state_handler.js
similarity index 97%
rename from lib/ace/keyboardstate.js
rename to lib/ace/keyboard/state_handler.js
index 7a76563a..ab50bc74 100644
--- a/lib/ace/keyboardstate.js
+++ b/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;
 });
diff --git a/lib/ace/textinput.js b/lib/ace/keyboard/textinput.js
similarity index 100%
rename from lib/ace/textinput.js
rename to lib/ace/keyboard/textinput.js
diff --git a/lib/ace/mode/vim.js b/lib/ace/keyboard/vim.js
similarity index 91%
rename from lib/ace/mode/vim.js
rename to lib/ace/keyboard/vim.js
index 1cb817ee..abe537f7 100644
--- a/lib/ace/mode/vim.js
+++ b/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);
-}
 });