Merge branch 'dump'

Conflicts:
	src/debug/ChromeDebugMessageStream.js
	src/debug/NodeSocket.js
	src/debug/StandaloneV8DebuggerService.js
	src/debug/V8DebuggerService.js
	src/debug/WSV8DebuggerService.js

src/ace/Editor.js

@@ -88,8 +88,8 @@ var Editor = function(renderer, doc) {
             this.doc.removeEventListener("changeBreakpoint", this.$onDocumentChangeBreakpoint);
 
             var selection = this.doc.getSelection();
-            this.selection.removeEventListener("changeCursor", this.$onCursorChange);
-            this.selection.removeEventListener("changeSelection", this.$onSelectionChange);
+            selection.removeEventListener("changeCursor", this.$onCursorChange);
+            selection.removeEventListener("changeSelection", this.$onSelectionChange);
 
             this.doc.setScrollTopRow(this.renderer.getScrollTopRow());
         }
@@ -861,7 +861,6 @@ var Editor = function(renderer, doc) {
         options = options || {};
         options.needle = needle;
         this.$search.set(options);
-        console.log("options: ", JSON.stringify(this.$search.$options));
         this.$find();
     },
 

src/ace/KeyBinding.js

@@ -51,7 +51,7 @@ var KeyBinding = function(element, editor, config) {
         "39" : "Right",
         "40" : "Down",
         "45" : "Insert",
-        "46" : "Del",
+        "46" : "Delete",
         "107": "+",
         "112": "F1",
         "113": "F2",

src/ace/MEventEmitter.js

@@ -5,7 +5,10 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
-require.def("ace/MEventEmitter", ["ace/ace"], function(ace) {
+
+if (!require.def) require.def = require("requireJS-node")(module);
+
+require.def("ace/MEventEmitter", ["ace/lib/lang"], function(lang) {
 
     var MEventEmitter = {}
 
@@ -30,7 +33,7 @@ require.def("ace/MEventEmitter", ["ace/ace"], function(ace) {
         if (!listeners) {
           var listeners = this.$eventRegistry[eventName] = [];
         }
-        if (ace.arrayIndexOf(listeners, callback) == -1) {
+        if (lang.arrayIndexOf(listeners, callback) == -1) {
             listeners.push(callback);
         }
     };
@@ -42,7 +45,7 @@ require.def("ace/MEventEmitter", ["ace/ace"], function(ace) {
         if (!listeners) {
           return;
         }
-        var index = ace.arrayIndexOf(listeners, callback);
+        var index = lang.arrayIndexOf(listeners, callback);
         if (index !== -1) {
             listeners.splice(index, 1);
         }

src/ace/VirtualRenderer.js

@@ -204,25 +204,27 @@ var VirtualRenderer = function(container) {
     };
 
     this.draw = function(scrollOnly, callback) {
-        if (this.$drawTimer) {
-            clearInterval(this.$drawTimer);
-            this.scrollOnly = this.scrollOnly && scrollOnly;
-        } else {
-            this.scollOnly = scrollOnly;
-        }
-
-        if (callback)
-            this.$drawCallbacks.push(callback);
-
-        var _self = this;
-        this.$drawTimer = setTimeout(function() {
-            _self.$draw(_self.scrollOnly);
-            for (var i=0; i<_self.$drawCallbacks.length; i++)
-                _self.$drawCallbacks[i]();
-
-            _self.$drawCallbacks = [];
-            delete _self.$drawTimer;
-        }, 0);
+        this.$draw(scrollOnly);
+        callback && callback();
+//        if (this.$drawTimer) {
+//            clearInterval(this.$drawTimer);
+//            this.scrollOnly = this.scrollOnly && scrollOnly;
+//        } else {
+//            this.scollOnly = scrollOnly;
+//        }
+//
+//        if (callback)
+//            this.$drawCallbacks.push(callback);
+//
+//        var _self = this;
+//        this.$drawTimer = setTimeout(function() {
+//            _self.$draw(_self.scrollOnly);
+//            for (var i=0; i<_self.$drawCallbacks.length; i++)
+//                _self.$drawCallbacks[i]();
+//
+//            _self.$drawCallbacks = [];
+//            delete _self.$drawTimer;
+//        }, 0);
     };
 
     this.$draw = function(scrollOnly) {

src/ace/ace.js

@@ -5,6 +5,9 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
+
+if (!require.def) require.def = require("requireJS-node")(module);
+
 require.def("ace/ace", [
         "ace/lib/core",
         "ace/lib/dom",

src/ace/conf/keybindings/default_mac.js

@@ -16,8 +16,7 @@ return {
     "findprevious": "Meta-Shift-K",
     "find": "Meta-F",
     "undo": "Meta-Z",
-    "redo": "Meta-Shift=Z",
-    "redo": "Meta-Y",
+    "redo": "Meta-Shift-Z|Meta-Y",
     "overwrite": "Insert",
     "copylinesup": "Meta-Alt-Up",
     "movelinesup": "Alt-Up",

src/ace/conf/keybindings/default_win.js

@@ -16,8 +16,7 @@ return {
     "findprevious": "Control-Shift-K",
     "find": "Control-F",
     "undo": "Control-Z",
-    "redo": "Control-Shift=Z",
-    "redo": "Control-Y",
+    "redo": "Control-Shift-Z|Control-Y",
     "overwrite": "Insert",
     "copylinesup": "Control-Alt-Up",
     "movelinesup": "Alt-Up",

src/ace/lib/core.js

@@ -5,6 +5,9 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
+
+if (!require.def) require.def = require("requireJS-node")(module);
+
 require.def("ace/lib/core", function() {
 
     var core = {};

src/ace/lib/dom.js

@@ -5,6 +5,9 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
+
+if (!require.def) require.def = require("requireJS-node")(module);
+
 require.def("ace/lib/dom", ["ace/lib/lang"], function(lang) {
 
     var dom = {};

src/ace/lib/event.js

@@ -5,6 +5,9 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
+
+if (!require.def) require.def = require("requireJS-node")(module);
+
 require.def("ace/lib/event", ["ace/lib/core"], function(core) {
 
     var event = {};

src/ace/lib/lang.js

@@ -5,10 +5,13 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
+
+if (!require.def) require.def = require("requireJS-node")(module);
+
 require.def("ace/lib/lang", function() {
 
     var lang = {};
-    
+
     lang.stringReverse = function(string) {
         return string.split("").reverse().join("");
     };

src/ace/lib/oop.js

@@ -5,10 +5,13 @@
  * @license LGPLv3 <http://www.gnu.org/licenses/lgpl-3.0.txt>
  * @author Fabian Jakobs <fabian AT ajax DOT org>
  */
+
+if (!require.def) require.def = require("requireJS-node")(module);
+
 require.def("ace/lib/oop", function() {
 
     var oop = {};
-    
+
     oop.inherits = function(ctor, superCtor) {
         var tempCtor = function() {};
         tempCtor.prototype = superCtor.prototype;