From 872afa690420b9d91e6ac3b0b6a4968ba9ec216d Mon Sep 17 00:00:00 2001
From: Fabian Jakobs <fabian.jakobs@web.de>
Date: Fri, 17 Sep 2010 11:27:15 +0200
Subject: [PATCH] requireJS fixes for the editor

---
 src/ace/Editor.js                       | 5 +++--
 src/ace/KeyBinding.js                   | 8 +++++---
 src/ace/VirtualRenderer.js              | 7 ++++---
 src/ace/conf/keybindings/default_mac.js | 2 +-
 src/ace/conf/keybindings/default_win.js | 2 +-
 src/ace/lib/lang.js                     | 4 ++--
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/ace/Editor.js b/src/ace/Editor.js
index 3b0c0383..b8cef49d 100644
--- a/src/ace/Editor.js
+++ b/src/ace/Editor.js
@@ -7,7 +7,8 @@ require.def("ace/Editor",
         "ace/Search",
         "ace/BackgroundTokenizer",
         "ace/Range",
-    ], function(ace, TextInput, KeyBinding, Document, Search, BackgroundTokenizer, Range) {
+        "ace/MEventEmitter"
+    ], function(ace, TextInput, KeyBinding, Document, Search, BackgroundTokenizer, Range, MEventEmitter) {
 
 var Editor = function(renderer, doc) {
     var container = renderer.getContainerElement();
@@ -44,7 +45,7 @@ var Editor = function(renderer, doc) {
 
 (function(){
 
-    ace.implement(this, ace.MEventEmitter);
+    ace.implement(this, MEventEmitter);
 
     this.$forwardEvents = {
         gutterclick: 1,
diff --git a/src/ace/KeyBinding.js b/src/ace/KeyBinding.js
index 74698ccf..2888b9fc 100644
--- a/src/ace/KeyBinding.js
+++ b/src/ace/KeyBinding.js
@@ -1,4 +1,6 @@
-require.def("ace/KeyBinding", ["ace/ace"], function(ace) {
+require.def("ace/KeyBinding", 
+    ["ace/ace", "ace/conf/keybindings/default_mac", "ace/conf/keybindings/default_win"],
+    function(ace, default_mac, default_win) {
 
 var KeyBinding = function(element, editor, config) {
     this.editor = editor;
@@ -53,8 +55,8 @@ var KeyBinding = function(element, editor, config) {
 
     this.setConfig = function(config) {
         this.config = config || ace.isMac 
-            ? ace.KeyBinding.default_mac
-            : ace.KeyBinding.default_win;
+            ? default_mac
+            : default_win;
         if (typeof this.config.reverse == "undefined")
             this.config.reverse = ace.objectReverse(this.config, "|");
     };
diff --git a/src/ace/VirtualRenderer.js b/src/ace/VirtualRenderer.js
index b5d77073..5582d377 100644
--- a/src/ace/VirtualRenderer.js
+++ b/src/ace/VirtualRenderer.js
@@ -5,8 +5,9 @@ require.def("ace/VirtualRenderer",
          "ace/layer/Marker",
          "ace/layer/Text",
          "ace/layer/Cursor",
-         "ace/ScrollBar"
-    ], function(ace, GutterLayer, MarkerLayer, TextLayer, CursorLayer, ScrollBar) {
+         "ace/ScrollBar",
+         "ace/MEventEmitter"
+    ], function(ace, GutterLayer, MarkerLayer, TextLayer, CursorLayer, ScrollBar, MEventEmitter) {
 
 var VirtualRenderer = function(container) {
     this.container = container;
@@ -62,7 +63,7 @@ var VirtualRenderer = function(container) {
 
 (function() {
 
-    ace.implement(this, ace.MEventEmitter);
+    ace.implement(this, MEventEmitter);
 
     this.setDocument = function(doc) {
         this.lines = doc.lines;
diff --git a/src/ace/conf/keybindings/default_mac.js b/src/ace/conf/keybindings/default_mac.js
index 7d84e120..8f8d3c30 100644
--- a/src/ace/conf/keybindings/default_mac.js
+++ b/src/ace/conf/keybindings/default_mac.js
@@ -1,4 +1,4 @@
-require.def("ace/conf/keybinding/default_mac", function() {
+require.def("ace/conf/keybindings/default_mac", function() {
 
 return {
     "selectall": "Meta-A",
diff --git a/src/ace/conf/keybindings/default_win.js b/src/ace/conf/keybindings/default_win.js
index c2c2a096..b8ab3f4c 100644
--- a/src/ace/conf/keybindings/default_win.js
+++ b/src/ace/conf/keybindings/default_win.js
@@ -1,4 +1,4 @@
-require.def("ace/conf/keybinding/default_win", function() {
+require.def("ace/conf/keybindings/default_win", function() {
 
 return {
     "selectall": "Control-A",
diff --git a/src/ace/lib/lang.js b/src/ace/lib/lang.js
index 1a1fb4e7..73d8149d 100644
--- a/src/ace/lib/lang.js
+++ b/src/ace/lib/lang.js
@@ -34,7 +34,7 @@ require.def("ace/lib/lang", function() {
         return copy;
     };
 
-    this.arrayToMap = function(arr) {
+    lang.arrayToMap = function(arr) {
         var map = {};
         for (var i=0; i<arr.length; i++) {
             map[arr[i]] = 1;
@@ -43,7 +43,7 @@ require.def("ace/lib/lang", function() {
 
     };
 
-    this.objectReverse = function(obj, keySplit) {
+    lang.objectReverse = function(obj, keySplit) {
         var i, j, l, key,
             ret = {};
         for (i in obj) {