From b38222c995575c0f3ae95749c3495dc2ac4193ef Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Thu, 23 Sep 2010 13:49:10 +0200 Subject: [PATCH 1/5] key binding fixes --- src/ace/KeyBinding.js | 2 +- src/ace/conf/keybindings/default_mac.js | 3 +-- src/ace/conf/keybindings/default_win.js | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/ace/KeyBinding.js b/src/ace/KeyBinding.js index 2c3e3aef..808f69cd 100644 --- a/src/ace/KeyBinding.js +++ b/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", diff --git a/src/ace/conf/keybindings/default_mac.js b/src/ace/conf/keybindings/default_mac.js index 4ee84e95..5036b19e 100644 --- a/src/ace/conf/keybindings/default_mac.js +++ b/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", diff --git a/src/ace/conf/keybindings/default_win.js b/src/ace/conf/keybindings/default_win.js index 7cbf6a2c..52d829f6 100644 --- a/src/ace/conf/keybindings/default_win.js +++ b/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", From abcabf0dcf87a8d5b3030a2c962bd8bc2040a1a0 Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Thu, 23 Sep 2010 18:40:27 +0200 Subject: [PATCH 2/5] minor change --- src/ace/Editor.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ace/Editor.js b/src/ace/Editor.js index da029f68..a899c84c 100644 --- a/src/ace/Editor.js +++ b/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()); } From c04aca0ebdec684b61f1b0ccd1732abb98ff7031 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Fri, 24 Sep 2010 01:17:42 +0200 Subject: [PATCH 3/5] * Added evaluate method From 411058a6c375b71a520c78584cdda333fab29ad2 Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Thu, 23 Sep 2010 18:41:55 +0200 Subject: [PATCH 4/5] make debugger node compatible --- src/ace/MEventEmitter.js | 9 ++++++--- src/ace/ace.js | 3 +++ src/ace/lib/core.js | 3 +++ src/ace/lib/dom.js | 3 +++ src/ace/lib/event.js | 3 +++ src/ace/lib/lang.js | 5 ++++- src/ace/lib/oop.js | 5 ++++- 7 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/ace/MEventEmitter.js b/src/ace/MEventEmitter.js index 32627d20..ba853710 100644 --- a/src/ace/MEventEmitter.js +++ b/src/ace/MEventEmitter.js @@ -5,7 +5,10 @@ * @license LGPLv3 * @author Fabian Jakobs */ -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); } diff --git a/src/ace/ace.js b/src/ace/ace.js index a254b454..32726e4f 100644 --- a/src/ace/ace.js +++ b/src/ace/ace.js @@ -5,6 +5,9 @@ * @license LGPLv3 * @author Fabian Jakobs */ + +if (!require.def) require.def = require("requireJS-node")(module); + require.def("ace/ace", [ "ace/lib/core", "ace/lib/dom", diff --git a/src/ace/lib/core.js b/src/ace/lib/core.js index d957156c..679c34f0 100644 --- a/src/ace/lib/core.js +++ b/src/ace/lib/core.js @@ -5,6 +5,9 @@ * @license LGPLv3 * @author Fabian Jakobs */ + +if (!require.def) require.def = require("requireJS-node")(module); + require.def("ace/lib/core", function() { var core = {}; diff --git a/src/ace/lib/dom.js b/src/ace/lib/dom.js index b8331c6e..a4ee8e14 100644 --- a/src/ace/lib/dom.js +++ b/src/ace/lib/dom.js @@ -5,6 +5,9 @@ * @license LGPLv3 * @author Fabian Jakobs */ + +if (!require.def) require.def = require("requireJS-node")(module); + require.def("ace/lib/dom", ["ace/lib/lang"], function(lang) { var dom = {}; diff --git a/src/ace/lib/event.js b/src/ace/lib/event.js index 6e048445..8c4f9bf1 100644 --- a/src/ace/lib/event.js +++ b/src/ace/lib/event.js @@ -5,6 +5,9 @@ * @license LGPLv3 * @author Fabian Jakobs */ + +if (!require.def) require.def = require("requireJS-node")(module); + require.def("ace/lib/event", ["ace/lib/core"], function(core) { var event = {}; diff --git a/src/ace/lib/lang.js b/src/ace/lib/lang.js index c17432e0..429172f9 100644 --- a/src/ace/lib/lang.js +++ b/src/ace/lib/lang.js @@ -5,10 +5,13 @@ * @license LGPLv3 * @author Fabian Jakobs */ + +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(""); }; diff --git a/src/ace/lib/oop.js b/src/ace/lib/oop.js index 093bea2b..67f44f2a 100644 --- a/src/ace/lib/oop.js +++ b/src/ace/lib/oop.js @@ -5,10 +5,13 @@ * @license LGPLv3 * @author Fabian Jakobs */ + +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; From 65d3586d45fb9d4d45fad9b6298d83098cc009ac Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Fri, 24 Sep 2010 07:48:20 +0200 Subject: [PATCH 5/5] disable timer --- src/ace/VirtualRenderer.js | 40 ++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/src/ace/VirtualRenderer.js b/src/ace/VirtualRenderer.js index d58668eb..1e4032b1 100644 --- a/src/ace/VirtualRenderer.js +++ b/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) {