small changes to the new key handler code

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/keyboard/vim").Vim;
+    var vim = require("ace/keyboard/keybinding/vim").Vim;
-    var emacs = require("ace/keyboard/emacs").Emacs;
+    var emacs = require("ace/keyboard/keybinding/emacs").Emacs;
     var HashHandler = require("ace/keyboard/hash_handler").HashHandler;
 
     var docs = {};
@@ -84,7 +84,6 @@ exports.launch = function(env) {
 
     var container = document.getElementById("editor");
     env.editor = new Editor(new Renderer(container, theme));
-<<<<<<< HEAD:demo/startup.js
     
     var modes = {
         text: new TextMode(),
@@ -107,7 +106,7 @@ exports.launch = function(env) {
     }
     modeEl.onchange = setMode;
     setMode();
-=======
+
     // This is how you can set a custom keyboardHandler.
     //
     // Define some basic keymapping using a hash:
@@ -117,7 +116,6 @@ exports.launch = function(env) {
     //
     // Use a more complex keymapping:
     // env.editor.setKeyboardHandler(vim);
->>>>>>> jviereck/keymapping:demo/demo_startup.js
 
     var docEl = document.getElementById("doc");
     function onDocChange() {

lib/ace/editor.js

@@ -488,7 +488,7 @@ var Editor =function(renderer, doc) {
     }
 
     this.onTextInput = function(text) {
-        this.keyBinding.onTextInput.call(this.keyBinding, text);
+        this.keyBinding.onTextInput(text);
     };
 
     this.onCommandKey = function(e, hashId, keyCode) {

lib/ace/keyboard/keybinding.js

@@ -43,8 +43,8 @@ var keyUtil  = require("pilot/keys");
 var event = require("pilot/event");
 var settings  = require("pilot/settings").settings;
 var HashHandler = require("ace/keyboard/hash_handler").HashHandler;
-var default_mac = require("ace/conf/keybindings/default_mac").bindings;
+var default_mac = require("ace/keyboard/keybinding/default_mac").bindings;
-var default_win = require("ace/conf/keybindings/default_win").bindings;
+var default_win = require("ace/keyboard/keybinding/default_win").bindings;
 var canon = require("pilot/canon");
 require("ace/commands/default_commands");
 
@@ -53,8 +53,8 @@ var KeyBinding = function(editor, config) {
     this.$data = { };
     this.$keyboardHandler = null;
     this.$defaulKeyboardHandler = new HashHandler(config || (useragent.isMac
-            ? default_mac
+        ? default_mac
-            : default_win));
+        : default_win));
 };
 
 (function() {