From fde5198af0aa173a47b4453ec9bd36578b3693a4 Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Tue, 9 Nov 2010 09:34:24 +0100 Subject: [PATCH] use relative module IDs --- lib/ace/background_tokenizer.js | 4 ++-- lib/ace/commands/default_commands.js | 2 +- lib/ace/conf/keybindings/default_mac.js | 1 - lib/ace/conf/keybindings/default_win.js | 1 - lib/ace/document.js | 12 ++++++------ lib/ace/editor.js | 20 ++++++++++---------- lib/ace/event_emitter.js | 2 +- lib/ace/keybinding.js | 10 +++++----- lib/ace/layer/cursor.js | 2 +- lib/ace/layer/marker.js | 2 +- lib/ace/layer/text.js | 6 +++--- lib/ace/lib/dom.js | 2 +- lib/ace/lib/event.js | 2 +- lib/ace/lib/lang.js | 1 - lib/ace/mode/css.js | 10 +++++----- lib/ace/mode/css_highlight_rules.js | 6 +++--- lib/ace/mode/doc_comment_highlight_rules.js | 4 ++-- lib/ace/mode/html.js | 12 ++++++------ lib/ace/mode/html_highlight_rules.js | 8 ++++---- lib/ace/mode/javascript.js | 12 ++++++------ lib/ace/mode/javascript_highlight_rules.js | 8 ++++---- lib/ace/mode/matching_brace_outdent.js | 2 +- lib/ace/mode/text.js | 4 ++-- lib/ace/mode/xml.js | 8 ++++---- lib/ace/mode/xml_highlight_rules.js | 4 ++-- lib/ace/range.js | 1 - lib/ace/scrollbar.js | 10 +++++----- lib/ace/search.js | 6 +++--- lib/ace/selection.js | 8 ++++---- lib/ace/textinput.js | 2 +- lib/ace/theme/clouds.js | 2 +- lib/ace/theme/clouds_mignight.js | 2 +- lib/ace/theme/cobalt.js | 2 +- lib/ace/theme/dawn.js | 2 +- lib/ace/theme/eclipse.js | 4 ++-- lib/ace/theme/idle_fingers.js | 2 +- lib/ace/theme/kr_theme.js | 2 +- lib/ace/theme/mono_industrial.js | 2 +- lib/ace/theme/monokai.js | 2 +- lib/ace/theme/textmate.js | 4 ++-- lib/ace/theme/twilight.js | 2 +- lib/ace/undomanager.js | 1 - lib/ace/virtual_renderer.js | 2 +- 43 files changed, 98 insertions(+), 103 deletions(-) diff --git a/lib/ace/background_tokenizer.js b/lib/ace/background_tokenizer.js index 35f73f9d..d3d6828f 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("./lib/oop"); +var MEventEmitter = require("./event_emitter"); var BackgroundTokenizer = function(tokenizer, editor) { this.running = false; diff --git a/lib/ace/commands/default_commands.js b/lib/ace/commands/default_commands.js index a83a464b..8d6a221a 100644 --- a/lib/ace/commands/default_commands.js +++ b/lib/ace/commands/default_commands.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var PluginManager = require("ace/plugin_manager"); +var PluginManager = require("../plugin_manager"); PluginManager.registerCommand("selectall", function(editor, selection) { selection.selectAll(); diff --git a/lib/ace/conf/keybindings/default_mac.js b/lib/ace/conf/keybindings/default_mac.js index 3c1a9260..ebb42832 100644 --- a/lib/ace/conf/keybindings/default_mac.js +++ b/lib/ace/conf/keybindings/default_mac.js @@ -37,7 +37,6 @@ define(function(require, exports, module) { - return { "selectall": "Command-A", "removeline": "Command-D", diff --git a/lib/ace/conf/keybindings/default_win.js b/lib/ace/conf/keybindings/default_win.js index 24d80370..931ed00e 100644 --- a/lib/ace/conf/keybindings/default_win.js +++ b/lib/ace/conf/keybindings/default_win.js @@ -37,7 +37,6 @@ define(function(require, exports, module) { - return { "selectall": "Ctrl-A", "removeline": "Ctrl-D", diff --git a/lib/ace/document.js b/lib/ace/document.js index 4e6e21a5..f265ea73 100644 --- a/lib/ace/document.js +++ b/lib/ace/document.js @@ -37,12 +37,12 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var lang = require("ace/lib/lang"); -var MEventEmitter = require("ace/event_emitter"); -var Selection = require("ace/selection"); -var TextMode = require("ace/mode/text"); -var Range = require("ace/range"); +var oop = require("./lib/oop"); +var lang = require("./lib/lang"); +var MEventEmitter = require("./event_emitter"); +var Selection = require("./selection"); +var TextMode = require("./mode/text"); +var Range = require("./range"); var Document = function(text, mode) { this.modified = true; diff --git a/lib/ace/editor.js b/lib/ace/editor.js index fb8993ce..20b7f249 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 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 oop = require("./lib/oop"); +var event = require("./lib/event"); +var lang = require("./lib/lang"); +var TextInput = require("./textinput"); +var KeyBinding = require("./keybinding"); +var Document = require("./document"); +var Search = require("./search"); +var BackgroundTokenizer = require("./background_tokenizer"); +var Range = require("./range"); +var MEventEmitter = require("./event_emitter"); 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..ee73b3c1 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("./lib/lang"); var MEventEmitter = {} diff --git a/lib/ace/keybinding.js b/lib/ace/keybinding.js index ab9fbbb3..2a592be8 100644 --- a/lib/ace/keybinding.js +++ b/lib/ace/keybinding.js @@ -37,11 +37,11 @@ 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 PluginManager = require("ace/plugin_manager"); +var core = require("./lib/core"); +var event = require("./lib/event"); +var default_mac = require("./conf/keybindings/default_mac"); +var default_win = require("./conf/keybindings/default_win"); +var PluginManager = require("./plugin_manager"); var KeyBinding = function(element, editor, config) { diff --git a/lib/ace/layer/cursor.js b/lib/ace/layer/cursor.js index 04402481..f1f99916 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("../lib/dom"); var Cursor = function(parentEl) { this.element = document.createElement("div"); diff --git a/lib/ace/layer/marker.js b/lib/ace/layer/marker.js index 0466f4be..0c304915 100644 --- a/lib/ace/layer/marker.js +++ b/lib/ace/layer/marker.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var Range = require("ace/range"); +var Range = require("../range"); var Marker = function(parentEl) { this.element = document.createElement("div"); diff --git a/lib/ace/layer/text.js b/lib/ace/layer/text.js index eb632a68..1c1a6264 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("../lib/oop"); +var dom = require("../lib/dom"); +var MEventEmitter = require("../event_emitter"); var Text = function(parentEl) { this.element = document.createElement("div"); diff --git a/lib/ace/lib/dom.js b/lib/ace/lib/dom.js index bbbe5c5b..86cd1e4b 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("./lang"); var dom = {}; diff --git a/lib/ace/lib/event.js b/lib/ace/lib/event.js index acc083c0..33176db2 100644 --- a/lib/ace/lib/event.js +++ b/lib/ace/lib/event.js @@ -38,7 +38,7 @@ define(function(require, exports, module) { -var core = require("ace/lib/core"); +var core = require("./core"); var event = {}; event.addListener = function(elem, type, callback) { diff --git a/lib/ace/lib/lang.js b/lib/ace/lib/lang.js index d3922ed1..2a9ff350 100644 --- a/lib/ace/lib/lang.js +++ b/lib/ace/lib/lang.js @@ -37,7 +37,6 @@ define(function(require, exports, module) { - var lang = {}; lang.stringReverse = function(string) { diff --git a/lib/ace/mode/css.js b/lib/ace/mode/css.js index a869fd8b..91819a91 100644 --- a/lib/ace/mode/css.js +++ b/lib/ace/mode/css.js @@ -37,11 +37,11 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text"); -var Tokenizer = require("ace/tokenizer"); -var CssHighlightRules = require("ace/mode/css_highlight_rules"); -var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent"); +var oop = require("../lib/oop"); +var TextMode = require("./text"); +var Tokenizer = require("../tokenizer"); +var CssHighlightRules = require("./css_highlight_rules"); +var MatchingBraceOutdent = require("./matching_brace_outdent"); var Css = function() { this.$tokenizer = new Tokenizer(new CssHighlightRules().getRules()); diff --git a/lib/ace/mode/css_highlight_rules.js b/lib/ace/mode/css_highlight_rules.js index 992850a5..938b9bca 100644 --- a/lib/ace/mode/css_highlight_rules.js +++ b/lib/ace/mode/css_highlight_rules.js @@ -37,9 +37,9 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var lang = require("ace/lib/lang"); -var TextHighlightRules = require("ace/mode/text_highlight_rules"); +var oop = require("../lib/oop"); +var lang = require("../lib/lang"); +var TextHighlightRules = require("./text_highlight_rules"); var CssHighlightRules = function() { diff --git a/lib/ace/mode/doc_comment_highlight_rules.js b/lib/ace/mode/doc_comment_highlight_rules.js index ad156c1d..5db3a5d1 100644 --- a/lib/ace/mode/doc_comment_highlight_rules.js +++ b/lib/ace/mode/doc_comment_highlight_rules.js @@ -37,8 +37,8 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextHighlightRules = require("ace/mode/text_highlight_rules"); +var oop = require("../lib/oop"); +var TextHighlightRules = require("./text_highlight_rules"); var DocCommentHighlightRules = function() { diff --git a/lib/ace/mode/html.js b/lib/ace/mode/html.js index 15e9cea1..8694b00a 100644 --- a/lib/ace/mode/html.js +++ b/lib/ace/mode/html.js @@ -37,12 +37,12 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text"); -var JavaScriptMode = require("ace/mode/javascript"); -var CssMode = require("ace/mode/css"); -var Tokenizer = require("ace/tokenizer"); -var HtmlHighlightRules = require("ace/mode/html_highlight_rules"); +var oop = require("../lib/oop"); +var TextMode = require("./text"); +var JavaScriptMode = require("./javascript"); +var CssMode = require("./css"); +var Tokenizer = require("../tokenizer"); +var HtmlHighlightRules = require("./html_highlight_rules"); var Html = function() { this.$tokenizer = new Tokenizer(new HtmlHighlightRules().getRules()); diff --git a/lib/ace/mode/html_highlight_rules.js b/lib/ace/mode/html_highlight_rules.js index 63eae027..c914b112 100644 --- a/lib/ace/mode/html_highlight_rules.js +++ b/lib/ace/mode/html_highlight_rules.js @@ -37,10 +37,10 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var CssHighlightRules = require("ace/mode/css_highlight_rules"); -var JavaScriptHighlightRules = require("ace/mode/javascript_highlight_rules"); -var TextHighlightRules = require("ace/mode/text_highlight_rules"); +var oop = require("../lib/oop"); +var CssHighlightRules = require("./css_highlight_rules"); +var JavaScriptHighlightRules = require("./javascript_highlight_rules"); +var TextHighlightRules = require("./text_highlight_rules"); var HtmlHighlightRules = function() { diff --git a/lib/ace/mode/javascript.js b/lib/ace/mode/javascript.js index 828bf3c4..92cd117d 100644 --- a/lib/ace/mode/javascript.js +++ b/lib/ace/mode/javascript.js @@ -37,12 +37,12 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text"); -var Tokenizer = require("ace/tokenizer"); -var JavaScriptHighlightRules = require("ace/mode/javascript_highlight_rules"); -var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent"); -var Range = require("ace/range"); +var oop = require("../lib/oop"); +var TextMode = require("./text"); +var Tokenizer = require("../tokenizer"); +var JavaScriptHighlightRules = require("./javascript_highlight_rules"); +var MatchingBraceOutdent = require("./matching_brace_outdent"); +var Range = require("../range"); var JavaScript = function() { this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules()); diff --git a/lib/ace/mode/javascript_highlight_rules.js b/lib/ace/mode/javascript_highlight_rules.js index 893e762f..039422c4 100644 --- a/lib/ace/mode/javascript_highlight_rules.js +++ b/lib/ace/mode/javascript_highlight_rules.js @@ -37,10 +37,10 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var lang = require("ace/lib/lang"); -var DocCommentHighlightRules = require("ace/mode/doc_comment_highlight_rules"); -var TextHighlightRules = require("ace/mode/text_highlight_rules"); +var oop = require("../lib/oop"); +var lang = require("../lib/lang"); +var DocCommentHighlightRules = require("./doc_comment_highlight_rules"); +var TextHighlightRules = require("./text_highlight_rules"); JavaScriptHighlightRules = function() { diff --git a/lib/ace/mode/matching_brace_outdent.js b/lib/ace/mode/matching_brace_outdent.js index 3c871a14..82777425 100644 --- a/lib/ace/mode/matching_brace_outdent.js +++ b/lib/ace/mode/matching_brace_outdent.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var Range = require("ace/range"); +var Range = require("../range"); var MatchingBraceOutdent = function() {}; diff --git a/lib/ace/mode/text.js b/lib/ace/mode/text.js index 3ee899d1..7cf04cb8 100644 --- a/lib/ace/mode/text.js +++ b/lib/ace/mode/text.js @@ -37,8 +37,8 @@ define(function(require, exports, module) { -var Tokenizer = require("ace/tokenizer"); -var TextHighlightRules = require("ace/mode/text_highlight_rules"); +var Tokenizer = require("../tokenizer"); +var TextHighlightRules = require("./text_highlight_rules"); var Text = function() { this.$tokenizer = new Tokenizer(new TextHighlightRules().getRules()); diff --git a/lib/ace/mode/xml.js b/lib/ace/mode/xml.js index 545e487e..a64eeac7 100644 --- a/lib/ace/mode/xml.js +++ b/lib/ace/mode/xml.js @@ -37,10 +37,10 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text"); -var Tokenizer = require("ace/tokenizer"); -var XmlHighlightRules = require("ace/mode/xml_highlight_rules"); +var oop = require("../lib/oop"); +var TextMode = require("./text"); +var Tokenizer = require("../tokenizer"); +var XmlHighlightRules = require("./xml_highlight_rules"); var Xml = function() { this.$tokenizer = new Tokenizer(new XmlHighlightRules().getRules()); diff --git a/lib/ace/mode/xml_highlight_rules.js b/lib/ace/mode/xml_highlight_rules.js index b1421791..69e7b691 100644 --- a/lib/ace/mode/xml_highlight_rules.js +++ b/lib/ace/mode/xml_highlight_rules.js @@ -37,8 +37,8 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextHighlightRules = require("ace/mode/text_highlight_rules"); +var oop = require("../lib/oop"); +var TextHighlightRules = require("./text_highlight_rules"); var XmlHighlightRules = function() { diff --git a/lib/ace/range.js b/lib/ace/range.js index 2f93e43b..31e4ecae 100644 --- a/lib/ace/range.js +++ b/lib/ace/range.js @@ -37,7 +37,6 @@ define(function(require, exports, module) { - var Range = function(startRow, startColumn, endRow, endColumn) { this.start = { row: startRow, diff --git a/lib/ace/scrollbar.js b/lib/ace/scrollbar.js index ba7acd0d..ec7f0197 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("./lib/oop"); +var lang = require("./lib/lang"); +var dom = require("./lib/dom"); +var event = require("./lib/event"); +var MEventEmitter = require("./event_emitter"); var ScrollBar = function(parent) { this.element = document.createElement("div"); diff --git a/lib/ace/search.js b/lib/ace/search.js index d751e399..e3f040c4 100644 --- a/lib/ace/search.js +++ b/lib/ace/search.js @@ -37,9 +37,9 @@ define(function(require, exports, module) { -var lang = require("ace/lib/lang"); -var oop = require("ace/lib/oop"); -var Range = require("ace/range"); +var lang = require("./lib/lang"); +var oop = require("./lib/oop"); +var Range = require("./range"); var Search = function() { this.$options = { diff --git a/lib/ace/selection.js b/lib/ace/selection.js index 8a7f9c19..7af93630 100644 --- a/lib/ace/selection.js +++ b/lib/ace/selection.js @@ -37,10 +37,10 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var lang = require("ace/lib/lang"); -var MEventEmitter = require("ace/event_emitter"); -var Range = require("ace/range"); +var oop = require("./lib/oop"); +var lang = require("./lib/lang"); +var MEventEmitter = require("./event_emitter"); +var Range = require("./range"); var Selection = function(doc) { this.doc = doc; diff --git a/lib/ace/textinput.js b/lib/ace/textinput.js index 629c0e95..4bcf479f 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("./lib/event"); var TextInput = function(parentNode, host) { diff --git a/lib/ace/theme/clouds.js b/lib/ace/theme/clouds.js index 2b8436e1..9489d9ea 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("../lib/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..93c3f99d 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("../lib/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..def66f11 100644 --- a/lib/ace/theme/cobalt.js +++ b/lib/ace/theme/cobalt.js @@ -1,6 +1,6 @@ define(function(require, exports, module) { -var dom = require("ace/lib/dom"); +var dom = require("../lib/dom"); var cssText = ".ace-cobalt .ace_editor {\ diff --git a/lib/ace/theme/dawn.js b/lib/ace/theme/dawn.js index ed6d33f1..247336da 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("../lib/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 b5fb2609..e2de3f51 100644 --- a/lib/ace/theme/eclipse.js +++ b/lib/ace/theme/eclipse.js @@ -1,7 +1,7 @@ -define(["require", "exports", "module", "text!./theme/tm.css", "./lib/dom"], +define(["require", "exports", "module", "text!./theme/tm.css", "../lib/dom"], function(require, exports, module, cssText) { - var dom = require(",/lib/dom"); + var dom = require("../lib/dom"); // import CSS once dom.importCssString(cssText); diff --git a/lib/ace/theme/idle_fingers.js b/lib/ace/theme/idle_fingers.js index f922c9fa..6975a87d 100644 --- a/lib/ace/theme/idle_fingers.js +++ b/lib/ace/theme/idle_fingers.js @@ -1,6 +1,6 @@ define(function(require, exports, module) { -var dom = require("ace/lib/dom"); +var dom = require("../lib/dom"); var cssText = ".ace-idle-fingers .ace_editor {\ diff --git a/lib/ace/theme/kr_theme.js b/lib/ace/theme/kr_theme.js index 684fd02e..406f159b 100644 --- a/lib/ace/theme/kr_theme.js +++ b/lib/ace/theme/kr_theme.js @@ -1,6 +1,6 @@ define(function(require, exports, module) { -var dom = require("ace/lib/dom"); +var dom = require("../lib/dom"); var cssText = ".ace-kr-theme .ace_editor {\ diff --git a/lib/ace/theme/mono_industrial.js b/lib/ace/theme/mono_industrial.js index 1463ec4a..842f7ec3 100644 --- a/lib/ace/theme/mono_industrial.js +++ b/lib/ace/theme/mono_industrial.js @@ -1,6 +1,6 @@ define(function(require, exports, module) { -var dom = require("ace/lib/dom"); +var dom = require("../lib/dom"); var cssText = ".ace-mono-industrial .ace_editor {\ diff --git a/lib/ace/theme/monokai.js b/lib/ace/theme/monokai.js index e7122013..d20ac5d5 100644 --- a/lib/ace/theme/monokai.js +++ b/lib/ace/theme/monokai.js @@ -1,6 +1,6 @@ define(function(require, exports, module) { -var dom = require("ace/lib/dom"); +var dom = require("../lib/dom"); var cssText = ".ace-monokai .ace_editor {\ diff --git a/lib/ace/theme/textmate.js b/lib/ace/theme/textmate.js index 1b44295f..a28c2d6e 100644 --- a/lib/ace/theme/textmate.js +++ b/lib/ace/theme/textmate.js @@ -1,7 +1,7 @@ -define(["require", "exports", "module", "text!ace/theme/tm.css", "ace/lib/dom"], +define(["require", "exports", "module", "text!ace/theme/tm.css", "../lib/dom"], function(require, exports, module, cssText) { - var dom = require("ace/lib/dom"); + var dom = require("../lib/dom"); // import CSS once dom.importCssString(cssText); diff --git a/lib/ace/theme/twilight.js b/lib/ace/theme/twilight.js index 42b636ed..1f3d61d5 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("../lib/dom"); var cssText = ".ace-twilight .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ diff --git a/lib/ace/undomanager.js b/lib/ace/undomanager.js index ee649a93..79a4ad7b 100644 --- a/lib/ace/undomanager.js +++ b/lib/ace/undomanager.js @@ -37,7 +37,6 @@ define(function(require, exports, module) { - var UndoManager = function() { this.$undoStack = []; this.$redoStack = []; diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js index 24f67b69..f0e93fbc 100644 --- a/lib/ace/virtual_renderer.js +++ b/lib/ace/virtual_renderer.js @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ -define(["require", "exports", "module", "text!./css/editor.css", "./lib/oop", "./lib/oop", +define(["require", "exports", "module", "text!ace/css/editor.css", "./lib/oop", "./lib/oop", "./lib/event", "./layer/gutter", "./layer/marker", "./layer/text", "./layer/cursor", "./scrollbar", "./renderloop", "./event_emitter"], function(require, exports, module, editorCss) {