From 4ab7c653cc7949d72463bddafb4f9168a9b8af15 Mon Sep 17 00:00:00 2001 From: Joe Walker Date: Mon, 15 Nov 2010 13:50:13 +0000 Subject: [PATCH] converting modules to use exports style rather than return style --- editor.html | 17 ++++++++++++++++- lib/ace/background_tokenizer.js | 4 ++-- lib/ace/conf/keybindings/default_mac.js | 2 +- lib/ace/conf/keybindings/default_win.js | 2 +- lib/ace/document.js | 6 +++--- lib/ace/editor.js | 8 ++++---- lib/ace/event_emitter.js | 4 ++-- lib/ace/keybinding.js | 8 ++++---- lib/ace/layer/cursor.js | 5 +++-- lib/ace/layer/gutter.js | 3 ++- lib/ace/layer/marker.js | 3 ++- lib/ace/layer/text.js | 9 +++++---- lib/ace/lib/core.js | 4 ++-- lib/ace/lib/dom.js | 6 +++--- lib/ace/lib/event.js | 5 +++-- lib/ace/lib/lang.js | 3 ++- lib/ace/lib/oop.js | 4 ++-- lib/ace/mode/css.js | 9 +++++---- lib/ace/mode/css_highlight_rules.js | 7 ++++--- lib/ace/mode/doc_comment_highlight_rules.js | 2 +- lib/ace/mode/html.js | 4 ++-- lib/ace/mode/html_highlight_rules.js | 4 ++-- lib/ace/mode/javascript.js | 2 +- lib/ace/mode/javascript_highlight_rules.js | 4 ++-- lib/ace/mode/xml.js | 2 +- lib/ace/mode/xml_highlight_rules.js | 2 +- lib/ace/scrollbar.js | 10 +++++----- lib/ace/search.js | 4 ++-- lib/ace/selection.js | 6 +++--- lib/ace/test/event_emitter_test.js | 11 ++++------- lib/ace/textinput.js | 2 +- lib/ace/theme/clouds.js | 2 +- lib/ace/theme/clouds_mignight.js | 2 +- lib/ace/theme/cobalt.js | 3 +-- lib/ace/theme/dawn.js | 2 +- lib/ace/theme/eclipse.js | 4 ++-- lib/ace/theme/idle_fingers.js | 3 +-- lib/ace/theme/kr_theme.js | 3 +-- lib/ace/theme/mono_industrial.js | 3 +-- lib/ace/theme/monokai.js | 3 +-- lib/ace/theme/textmate.js | 2 +- lib/ace/theme/twilight.js | 2 +- lib/ace/virtual_renderer.js | 18 +++++++++--------- 43 files changed, 112 insertions(+), 97 deletions(-) diff --git a/editor.html b/editor.html index 0488bb74..2251c2ab 100644 --- a/editor.html +++ b/editor.html @@ -147,7 +147,22 @@ require( "ace/mode/xml", "ace/mode/text", "ace/undomanager" - ], function(event, Editor, Renderer, theme, Document, JavaScriptMode, CssMode, HtmlMode, XmlMode, TextMode, UndoManager) { + ], function( + eventMod, + Editor, + Renderer, + theme, + Document, + JavaScriptMode, + cssMod, + HtmlMode, + XmlMode, + TextMode, + UndoManager + ) { + +var event = eventMod.event; +var CssMode = cssMod.Css; var docs = {} diff --git a/lib/ace/background_tokenizer.js b/lib/ace/background_tokenizer.js index 35f73f9d..4b557352 100644 --- a/lib/ace/background_tokenizer.js +++ b/lib/ace/background_tokenizer.js @@ -37,8 +37,8 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var MEventEmitter = require("ace/event_emitter"); +var oop = require("ace/lib/oop").oop; +var MEventEmitter = require("ace/event_emitter").MEventEmitter; var BackgroundTokenizer = function(tokenizer, editor) { this.running = false; diff --git a/lib/ace/conf/keybindings/default_mac.js b/lib/ace/conf/keybindings/default_mac.js index ebb42832..515a88bd 100644 --- a/lib/ace/conf/keybindings/default_mac.js +++ b/lib/ace/conf/keybindings/default_mac.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -return { +exports.bindings = { "selectall": "Command-A", "removeline": "Command-D", "gotoline": "Command-L", diff --git a/lib/ace/conf/keybindings/default_win.js b/lib/ace/conf/keybindings/default_win.js index 931ed00e..7f546f2d 100644 --- a/lib/ace/conf/keybindings/default_win.js +++ b/lib/ace/conf/keybindings/default_win.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -return { +exports.bindings = { "selectall": "Ctrl-A", "removeline": "Ctrl-D", "gotoline": "Ctrl-L", diff --git a/lib/ace/document.js b/lib/ace/document.js index 4e6e21a5..2136655d 100644 --- a/lib/ace/document.js +++ b/lib/ace/document.js @@ -37,9 +37,9 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var lang = require("ace/lib/lang"); -var MEventEmitter = require("ace/event_emitter"); +var oop = require("ace/lib/oop").oop; +var lang = require("ace/lib/lang").lang; +var MEventEmitter = require("ace/event_emitter").MEventEmitter; var Selection = require("ace/selection"); var TextMode = require("ace/mode/text"); var Range = require("ace/range"); diff --git a/lib/ace/editor.js b/lib/ace/editor.js index fb8993ce..87db8917 100644 --- a/lib/ace/editor.js +++ b/lib/ace/editor.js @@ -37,16 +37,16 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var event = require("ace/lib/event"); -var lang = require("ace/lib/lang"); +var oop = require("ace/lib/oop").oop; +var event = require("ace/lib/event").event; +var lang = require("ace/lib/lang").lang; var TextInput = require("ace/textinput"); var KeyBinding = require("ace/keybinding"); var Document = require("ace/document"); var Search = require("ace/search"); var BackgroundTokenizer = require("ace/background_tokenizer"); var Range = require("ace/range"); -var MEventEmitter = require("ace/event_emitter"); +var MEventEmitter = require("ace/event_emitter").MEventEmitter; var Editor =function(renderer, doc) { var container = renderer.getContainerElement(); diff --git a/lib/ace/event_emitter.js b/lib/ace/event_emitter.js index 29b0b170..3bfb8277 100644 --- a/lib/ace/event_emitter.js +++ b/lib/ace/event_emitter.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { - var lang = require("ace/lib/lang"); + var lang = require("ace/lib/lang").lang; var MEventEmitter = {} @@ -81,5 +81,5 @@ define(function(require, exports, module) { } }; - return MEventEmitter; + exports.MEventEmitter = MEventEmitter; }); diff --git a/lib/ace/keybinding.js b/lib/ace/keybinding.js index 94f7e072..6ce54bd5 100644 --- a/lib/ace/keybinding.js +++ b/lib/ace/keybinding.js @@ -37,10 +37,10 @@ define(function(require, exports, module) { -var core = require("ace/lib/core"); -var event = require("ace/lib/event"); -var default_mac = require("ace/conf/keybindings/default_mac"); -var default_win = require("ace/conf/keybindings/default_win"); +var core = require("ace/lib/core").core; +var event = require("ace/lib/event").event; +var default_mac = require("ace/conf/keybindings/default_mac").bindings; +var default_win = require("ace/conf/keybindings/default_win").bindings; var PluginManager = require("ace/plugin_manager"); require("ace/commands/default_commands"); diff --git a/lib/ace/layer/cursor.js b/lib/ace/layer/cursor.js index 04402481..63df911b 100644 --- a/lib/ace/layer/cursor.js +++ b/lib/ace/layer/cursor.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var dom = require("ace/lib/dom"); +var dom = require("ace/lib/dom").dom; var Cursor = function(parentEl) { this.element = document.createElement("div"); @@ -145,5 +145,6 @@ var Cursor = function(parentEl) { }).call(Cursor.prototype); -return Cursor; +exports.Cursor = Cursor; + }); diff --git a/lib/ace/layer/gutter.js b/lib/ace/layer/gutter.js index 87db1632..4202772f 100644 --- a/lib/ace/layer/gutter.js +++ b/lib/ace/layer/gutter.js @@ -81,5 +81,6 @@ var Gutter = function(parentEl) { }).call(Gutter.prototype); -return Gutter; +exports.Gutter = Gutter; + }); diff --git a/lib/ace/layer/marker.js b/lib/ace/layer/marker.js index 0466f4be..1e571c83 100644 --- a/lib/ace/layer/marker.js +++ b/lib/ace/layer/marker.js @@ -181,5 +181,6 @@ var Marker = function(parentEl) { }).call(Marker.prototype); -return Marker; +exports.Marker = Marker; + }); diff --git a/lib/ace/layer/text.js b/lib/ace/layer/text.js index eb632a68..bd610b52 100644 --- a/lib/ace/layer/text.js +++ b/lib/ace/layer/text.js @@ -37,9 +37,9 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var dom = require("ace/lib/dom"); -var MEventEmitter = require("ace/event_emitter"); +var oop = require("ace/lib/oop").oop; +var dom = require("ace/lib/dom").dom; +var MEventEmitter = require("ace/event_emitter").MEventEmitter; var Text = function(parentEl) { this.element = document.createElement("div"); @@ -297,5 +297,6 @@ var Text = function(parentEl) { }).call(Text.prototype); -return Text; +exports.Text = Text; + }); diff --git a/lib/ace/lib/core.js b/lib/ace/lib/core.js index 295be086..29aacf9e 100644 --- a/lib/ace/lib/core.js +++ b/lib/ace/lib/core.js @@ -58,6 +58,6 @@ define(function(require, exports, module) { } }; - return core; + exports.core = core; -}); \ No newline at end of file +}); diff --git a/lib/ace/lib/dom.js b/lib/ace/lib/dom.js index 069a2bd9..4dac3cb1 100644 --- a/lib/ace/lib/dom.js +++ b/lib/ace/lib/dom.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { - var lang = require("ace/lib/lang"); + var lang = require("ace/lib/lang").lang; var dom = {}; @@ -137,5 +137,5 @@ define(function(require, exports, module) { return noScrollbar-withScrollbar; }; - return dom; -}); \ No newline at end of file + exports.dom = dom; +}); diff --git a/lib/ace/lib/event.js b/lib/ace/lib/event.js index a1561184..d0569a63 100644 --- a/lib/ace/lib/event.js +++ b/lib/ace/lib/event.js @@ -37,7 +37,8 @@ define(function(require, exports, module) { - var core = require("ace/lib/core"); + +var core = require("ace/lib/core").core; var event = {}; event.addListener = function(elem, type, callback) { @@ -237,5 +238,5 @@ define(function(require, exports, module) { } }; - return event; + exports.event = event; }); \ No newline at end of file diff --git a/lib/ace/lib/lang.js b/lib/ace/lib/lang.js index 2a9ff350..01045cfa 100644 --- a/lib/ace/lib/lang.js +++ b/lib/ace/lib/lang.js @@ -37,6 +37,7 @@ define(function(require, exports, module) { + var lang = {}; lang.stringReverse = function(string) { @@ -121,5 +122,5 @@ define(function(require, exports, module) { }; }; - return lang; + exports.lang = lang; }); diff --git a/lib/ace/lib/oop.js b/lib/ace/lib/oop.js index 8a825a27..eaf2cc73 100644 --- a/lib/ace/lib/oop.js +++ b/lib/ace/lib/oop.js @@ -57,5 +57,5 @@ define(function(require, exports, module) { oop.mixin(proto, mixin); }; - return oop; -}); \ No newline at end of file + exports.oop = oop; +}); diff --git a/lib/ace/mode/css.js b/lib/ace/mode/css.js index a869fd8b..50c1dc24 100644 --- a/lib/ace/mode/css.js +++ b/lib/ace/mode/css.js @@ -37,10 +37,10 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); +var oop = require("ace/lib/oop").oop; var TextMode = require("ace/mode/text"); var Tokenizer = require("ace/tokenizer"); -var CssHighlightRules = require("ace/mode/css_highlight_rules"); +var CssHighlightRules = require("ace/mode/css_highlight_rules").CssHighlightRules; var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent"); var Css = function() { @@ -78,5 +78,6 @@ oop.inherits(Css, TextMode); }).call(Css.prototype); -return Css; -}); \ No newline at end of file +exports.Css = Css; + +}); diff --git a/lib/ace/mode/css_highlight_rules.js b/lib/ace/mode/css_highlight_rules.js index 992850a5..c3482711 100644 --- a/lib/ace/mode/css_highlight_rules.js +++ b/lib/ace/mode/css_highlight_rules.js @@ -37,8 +37,8 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var lang = require("ace/lib/lang"); +var oop = require("ace/lib/oop").oop; +var lang = require("ace/lib/lang").lang; var TextHighlightRules = require("ace/mode/text_highlight_rules"); var CssHighlightRules = function() { @@ -229,5 +229,6 @@ var CssHighlightRules = function() { oop.inherits(CssHighlightRules, TextHighlightRules); -return CssHighlightRules; +exports.CssHighlightRules = CssHighlightRules; + }); diff --git a/lib/ace/mode/doc_comment_highlight_rules.js b/lib/ace/mode/doc_comment_highlight_rules.js index ad156c1d..4740af3b 100644 --- a/lib/ace/mode/doc_comment_highlight_rules.js +++ b/lib/ace/mode/doc_comment_highlight_rules.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); +var oop = require("ace/lib/oop").oop; var TextHighlightRules = require("ace/mode/text_highlight_rules"); var DocCommentHighlightRules = function() { diff --git a/lib/ace/mode/html.js b/lib/ace/mode/html.js index 15e9cea1..525927e0 100644 --- a/lib/ace/mode/html.js +++ b/lib/ace/mode/html.js @@ -37,10 +37,10 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); +var oop = require("ace/lib/oop").oop; var TextMode = require("ace/mode/text"); var JavaScriptMode = require("ace/mode/javascript"); -var CssMode = require("ace/mode/css"); +var CssMode = require("ace/mode/css").Css; var Tokenizer = require("ace/tokenizer"); var HtmlHighlightRules = require("ace/mode/html_highlight_rules"); diff --git a/lib/ace/mode/html_highlight_rules.js b/lib/ace/mode/html_highlight_rules.js index 63eae027..360e7a1f 100644 --- a/lib/ace/mode/html_highlight_rules.js +++ b/lib/ace/mode/html_highlight_rules.js @@ -37,8 +37,8 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var CssHighlightRules = require("ace/mode/css_highlight_rules"); +var oop = require("ace/lib/oop").oop; +var CssHighlightRules = require("ace/mode/css_highlight_rules").CssHighlightRules; var JavaScriptHighlightRules = require("ace/mode/javascript_highlight_rules"); var TextHighlightRules = require("ace/mode/text_highlight_rules"); diff --git a/lib/ace/mode/javascript.js b/lib/ace/mode/javascript.js index 828bf3c4..9cff8ab7 100644 --- a/lib/ace/mode/javascript.js +++ b/lib/ace/mode/javascript.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); +var oop = require("ace/lib/oop").oop; var TextMode = require("ace/mode/text"); var Tokenizer = require("ace/tokenizer"); var JavaScriptHighlightRules = require("ace/mode/javascript_highlight_rules"); diff --git a/lib/ace/mode/javascript_highlight_rules.js b/lib/ace/mode/javascript_highlight_rules.js index 893e762f..3a80ed5a 100644 --- a/lib/ace/mode/javascript_highlight_rules.js +++ b/lib/ace/mode/javascript_highlight_rules.js @@ -37,8 +37,8 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var lang = require("ace/lib/lang"); +var oop = require("ace/lib/oop").oop; +var lang = require("ace/lib/lang").lang; var DocCommentHighlightRules = require("ace/mode/doc_comment_highlight_rules"); var TextHighlightRules = require("ace/mode/text_highlight_rules"); diff --git a/lib/ace/mode/xml.js b/lib/ace/mode/xml.js index 545e487e..2603d023 100644 --- a/lib/ace/mode/xml.js +++ b/lib/ace/mode/xml.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); +var oop = require("ace/lib/oop").oop; var TextMode = require("ace/mode/text"); var Tokenizer = require("ace/tokenizer"); var XmlHighlightRules = require("ace/mode/xml_highlight_rules"); diff --git a/lib/ace/mode/xml_highlight_rules.js b/lib/ace/mode/xml_highlight_rules.js index b1421791..28255835 100644 --- a/lib/ace/mode/xml_highlight_rules.js +++ b/lib/ace/mode/xml_highlight_rules.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); +var oop = require("ace/lib/oop").oop; var TextHighlightRules = require("ace/mode/text_highlight_rules"); var XmlHighlightRules = function() { diff --git a/lib/ace/scrollbar.js b/lib/ace/scrollbar.js index ba7acd0d..978e63ee 100644 --- a/lib/ace/scrollbar.js +++ b/lib/ace/scrollbar.js @@ -37,11 +37,11 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var lang = require("ace/lib/lang"); -var dom = require("ace/lib/dom"); -var event = require("ace/lib/event"); -var MEventEmitter = require("ace/event_emitter"); +var oop = require("ace/lib/oop").oop; +var lang = require("ace/lib/lang").lang; +var dom = require("ace/lib/dom").dom; +var event = require("ace/lib/event").event; +var MEventEmitter = require("ace/event_emitter").MEventEmitter; var ScrollBar = function(parent) { this.element = document.createElement("div"); diff --git a/lib/ace/search.js b/lib/ace/search.js index d751e399..9117b310 100644 --- a/lib/ace/search.js +++ b/lib/ace/search.js @@ -37,8 +37,8 @@ define(function(require, exports, module) { -var lang = require("ace/lib/lang"); -var oop = require("ace/lib/oop"); +var lang = require("ace/lib/lang").lang; +var oop = require("ace/lib/oop").oop; var Range = require("ace/range"); var Search = function() { diff --git a/lib/ace/selection.js b/lib/ace/selection.js index 8a7f9c19..7b98b073 100644 --- a/lib/ace/selection.js +++ b/lib/ace/selection.js @@ -37,9 +37,9 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var lang = require("ace/lib/lang"); -var MEventEmitter = require("ace/event_emitter"); +var oop = require("ace/lib/oop").oop; +var lang = require("ace/lib/lang").lang; +var MEventEmitter = require("ace/event_emitter").MEventEmitter; var Range = require("ace/range"); var Selection = function(doc) { diff --git a/lib/ace/test/event_emitter_test.js b/lib/ace/test/event_emitter_test.js index 22c6e9fe..a099d3fc 100644 --- a/lib/ace/test/event_emitter_test.js +++ b/lib/ace/test/event_emitter_test.js @@ -6,13 +6,10 @@ * @author Fabian Jakobs */ -require.def([ - "ace/lib/oop", - "ace/MEventEmitter" - ], function( - oop, - MEventEmitter - ) { +define(function(require, exports, module) { + +var MEventEmitter = require("ace/event_emitter").MEventEmitter; +var oop = require("ace/lib/oop").oop; var EventEmitter = function() {}; diff --git a/lib/ace/textinput.js b/lib/ace/textinput.js index 629c0e95..94c38d5f 100644 --- a/lib/ace/textinput.js +++ b/lib/ace/textinput.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var event = require("ace/lib/event"); +var event = require("ace/lib/event").event; var TextInput = function(parentNode, host) { diff --git a/lib/ace/theme/clouds.js b/lib/ace/theme/clouds.js index 2b8436e1..aebaa9f4 100644 --- a/lib/ace/theme/clouds.js +++ b/lib/ace/theme/clouds.js @@ -1,6 +1,6 @@ define(function(require, exports, module) { -var dom = require("ace/lib/dom"); + var dom = require("ace/lib/dom").dom; var cssText = ".ace-clouds .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ diff --git a/lib/ace/theme/clouds_mignight.js b/lib/ace/theme/clouds_mignight.js index b42978c8..c8d63f34 100644 --- a/lib/ace/theme/clouds_mignight.js +++ b/lib/ace/theme/clouds_mignight.js @@ -1,6 +1,6 @@ define(function(require, exports, module) { -var dom = require("ace/lib/dom"); + var dom = require("ace/lib/dom").dom; var cssText = ".ace-clouds-midnight .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ diff --git a/lib/ace/theme/cobalt.js b/lib/ace/theme/cobalt.js index 433214b3..434fde51 100644 --- a/lib/ace/theme/cobalt.js +++ b/lib/ace/theme/cobalt.js @@ -1,7 +1,6 @@ define(function(require, exports, module) { -var dom = require("ace/lib/dom"); - + var dom = require("ace/lib/dom").dom; var cssText = ".ace-cobalt .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ diff --git a/lib/ace/theme/dawn.js b/lib/ace/theme/dawn.js index ed6d33f1..0bb2f07c 100644 --- a/lib/ace/theme/dawn.js +++ b/lib/ace/theme/dawn.js @@ -1,6 +1,6 @@ define(function(require, exports, module) { -var dom = require("ace/lib/dom"); + var dom = require("ace/lib/dom").dom; var cssText = ".ace-dawn .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ diff --git a/lib/ace/theme/eclipse.js b/lib/ace/theme/eclipse.js index 4bc7b13d..d37fa463 100644 --- a/lib/ace/theme/eclipse.js +++ b/lib/ace/theme/eclipse.js @@ -1,7 +1,7 @@ define(function(require, exports, module) { -var dom = require("ace/lib/dom"); -var cssText = require("text!ace/theme/eclipse.css"); + var dom = require("ace/lib/dom").dom; + var cssText = require("text!ace/theme/eclipse.css"); // import CSS once dom.importCssString(cssText); diff --git a/lib/ace/theme/idle_fingers.js b/lib/ace/theme/idle_fingers.js index f922c9fa..25db5a79 100644 --- a/lib/ace/theme/idle_fingers.js +++ b/lib/ace/theme/idle_fingers.js @@ -1,7 +1,6 @@ define(function(require, exports, module) { -var dom = require("ace/lib/dom"); - + var dom = require("ace/lib/dom").dom; var cssText = ".ace-idle-fingers .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ diff --git a/lib/ace/theme/kr_theme.js b/lib/ace/theme/kr_theme.js index 684fd02e..e3caa8a7 100644 --- a/lib/ace/theme/kr_theme.js +++ b/lib/ace/theme/kr_theme.js @@ -1,7 +1,6 @@ define(function(require, exports, module) { -var dom = require("ace/lib/dom"); - + var dom = require("ace/lib/dom").dom; var cssText = ".ace-kr-theme .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ diff --git a/lib/ace/theme/mono_industrial.js b/lib/ace/theme/mono_industrial.js index 1463ec4a..e7c96747 100644 --- a/lib/ace/theme/mono_industrial.js +++ b/lib/ace/theme/mono_industrial.js @@ -1,7 +1,6 @@ define(function(require, exports, module) { -var dom = require("ace/lib/dom"); - + var dom = require("ace/lib/dom").dom; var cssText = ".ace-mono-industrial .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ diff --git a/lib/ace/theme/monokai.js b/lib/ace/theme/monokai.js index e7122013..de54f859 100644 --- a/lib/ace/theme/monokai.js +++ b/lib/ace/theme/monokai.js @@ -1,7 +1,6 @@ define(function(require, exports, module) { -var dom = require("ace/lib/dom"); - + var dom = require("ace/lib/dom").dom; var cssText = ".ace-monokai .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ diff --git a/lib/ace/theme/textmate.js b/lib/ace/theme/textmate.js index 4ad77e77..025a8fa1 100644 --- a/lib/ace/theme/textmate.js +++ b/lib/ace/theme/textmate.js @@ -1,6 +1,6 @@ define(function(require, exports, module) { - var dom = require("ace/lib/dom"); + var dom = require("ace/lib/dom").dom; var cssText = require("text!ace/theme/tm.css"); // import CSS once diff --git a/lib/ace/theme/twilight.js b/lib/ace/theme/twilight.js index 42b636ed..4d09c6e6 100644 --- a/lib/ace/theme/twilight.js +++ b/lib/ace/theme/twilight.js @@ -1,6 +1,6 @@ define(function(require, exports, module) { -var dom = require("ace/lib/dom"); + var dom = require("ace/lib/dom").dom; var cssText = ".ace-twilight .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js index 8f3544a7..ad4aae18 100644 --- a/lib/ace/virtual_renderer.js +++ b/lib/ace/virtual_renderer.js @@ -37,17 +37,17 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var lang = require("ace/lib/lang"); -var dom = require("ace/lib/dom"); -var event = require("ace/lib/event"); -var GutterLayer = require("ace/layer/gutter"); -var MarkerLayer = require("ace/layer/marker"); -var TextLayer = require("ace/layer/text"); -var CursorLayer = require("ace/layer/cursor"); +var oop = require("ace/lib/oop").oop; +var lang = require("ace/lib/lang").lang; +var dom = require("ace/lib/dom").dom; +var event = require("ace/lib/event").event; +var GutterLayer = require("ace/layer/gutter").Gutter; +var MarkerLayer = require("ace/layer/marker").Marker; +var TextLayer = require("ace/layer/text").Text; +var CursorLayer = require("ace/layer/cursor").Cursor; var ScrollBar = require("ace/scrollbar"); var RenderLoop = require("ace/renderloop"); -var MEventEmitter = require("ace/event_emitter"); +var MEventEmitter = require("ace/event_emitter").MEventEmitter; var editorCss = require("text!ace/css/editor.css"); // import CSS once