From 872125db46c7f1d44989710a2967d1f55109b681 Mon Sep 17 00:00:00 2001 From: nightwing Date: Sat, 13 Oct 2012 17:46:44 +0400 Subject: [PATCH] use relative paths everywhere --- lib/ace/ext/textarea.js | 2 +- lib/ace/keyboard/vim/maps/motions.js | 4 ++-- lib/ace/mode/jade.js | 4 ++-- lib/ace/placeholder.js | 2 +- lib/ace/placeholder_test.js | 4 ++-- lib/ace/requirejs/text.js | 2 +- lib/ace/theme/ambiance.js | 2 +- lib/ace/theme/chrome.js | 2 +- lib/ace/theme/clouds.js | 2 +- lib/ace/theme/clouds_midnight.js | 2 +- lib/ace/theme/cobalt.js | 2 +- lib/ace/theme/crimson_editor.js | 2 +- lib/ace/theme/dawn.js | 2 +- lib/ace/theme/dreamweaver.js | 2 +- lib/ace/theme/eclipse.js | 2 +- lib/ace/theme/github.js | 2 +- lib/ace/theme/idle_fingers.js | 2 +- lib/ace/theme/kr_theme.js | 2 +- lib/ace/theme/merbivore.js | 2 +- lib/ace/theme/merbivore_soft.js | 2 +- lib/ace/theme/mono_industrial.css | 2 +- lib/ace/theme/mono_industrial.js | 2 +- lib/ace/theme/monokai.js | 2 +- lib/ace/theme/pastel_on_dark.js | 2 +- lib/ace/theme/solarized_dark.js | 2 +- lib/ace/theme/solarized_light.js | 2 +- lib/ace/theme/textmate.js | 2 +- lib/ace/theme/tomorrow.js | 2 +- lib/ace/theme/tomorrow_night.js | 2 +- lib/ace/theme/tomorrow_night_blue.js | 2 +- lib/ace/theme/tomorrow_night_bright.js | 2 +- lib/ace/theme/tomorrow_night_eighties.js | 2 +- lib/ace/theme/twilight.js | 2 +- lib/ace/theme/vibrant_ink.js | 2 +- lib/ace/theme/xcode.js | 2 +- lib/ace/virtual_renderer.js | 2 +- tool/tmtheme.js | 2 +- 37 files changed, 40 insertions(+), 40 deletions(-) diff --git a/lib/ace/ext/textarea.js b/lib/ace/ext/textarea.js index ddb57df0..a8f6317f 100644 --- a/lib/ace/ext/textarea.js +++ b/lib/ace/ext/textarea.js @@ -36,7 +36,7 @@ var UA = require("../lib/useragent"); var net = require("../lib/net"); var ace = require("../ace"); -require("ace/theme/textmate"); +require("../theme/textmate"); module.exports = exports = ace; diff --git a/lib/ace/keyboard/vim/maps/motions.js b/lib/ace/keyboard/vim/maps/motions.js index 227862b9..f5e0f163 100644 --- a/lib/ace/keyboard/vim/maps/motions.js +++ b/lib/ace/keyboard/vim/maps/motions.js @@ -127,7 +127,7 @@ var StringStream = function(editor, cursor) { }; }; -var Search = require("ace/search").Search; +var Search = require("../../../search").Search; var search = new Search(); function find(editor, needle, dir) { @@ -136,7 +136,7 @@ function find(editor, needle, dir) { return search.find(editor.session); } -var Range = require("ace/range").Range; +var Range = require("../../../range").Range; module.exports = { "w": new Motion(function(editor) { diff --git a/lib/ace/mode/jade.js b/lib/ace/mode/jade.js index 03b54306..076b29c8 100644 --- a/lib/ace/mode/jade.js +++ b/lib/ace/mode/jade.js @@ -40,8 +40,8 @@ var oop = require("../lib/oop"); var TextMode = require("./text").Mode; var Tokenizer = require("../tokenizer").Tokenizer; var JadeHighlightRules = require("./jade_highlight_rules").JadeHighlightRules; -// var JavascriptMode = require("ace/mode/javascript").Mode; -// var CssMode = require("ace/mode/css").Mode; +// var JavascriptMode = require("../mode/javascript").Mode; +// var CssMode = require("../mode/css").Mode; var Mode = function() { var highlighter = new JadeHighlightRules(); diff --git a/lib/ace/placeholder.js b/lib/ace/placeholder.js index 8a93ee54..3306cba1 100644 --- a/lib/ace/placeholder.js +++ b/lib/ace/placeholder.js @@ -30,7 +30,7 @@ define(function(require, exports, module) { "use strict"; -var Range = require('./range').Range; +var Range = require("./range").Range; var EventEmitter = require("./lib/event_emitter").EventEmitter; var oop = require("./lib/oop"); diff --git a/lib/ace/placeholder_test.js b/lib/ace/placeholder_test.js index f395042b..97e561fd 100644 --- a/lib/ace/placeholder_test.js +++ b/lib/ace/placeholder_test.js @@ -41,8 +41,8 @@ var Editor = require("./editor").Editor; var MockRenderer = require("./test/mockrenderer").MockRenderer; var assert = require("./test/assertions"); var JavaScriptMode = require("./mode/javascript").Mode; -var PlaceHolder = require('./placeholder').PlaceHolder; -var UndoManager = require('./undomanager').UndoManager; +var PlaceHolder = require("./placeholder").PlaceHolder; +var UndoManager = require("./undomanager").UndoManager; module.exports = { diff --git a/lib/ace/requirejs/text.js b/lib/ace/requirejs/text.js index 66123169..cba62eef 100644 --- a/lib/ace/requirejs/text.js +++ b/lib/ace/requirejs/text.js @@ -44,7 +44,7 @@ define(function (require, exports, module) { if (globalRequire && globalRequire.nodeRequire) onLoad(globalRequire.nodeRequire('fs').readFileSync(req.toUrl(name), 'utf8')); else - require("ace/lib/net").get(req.toUrl(name), onLoad); + require("../lib/net").get(req.toUrl(name), onLoad); }; }); diff --git a/lib/ace/theme/ambiance.js b/lib/ace/theme/ambiance.js index 4c74d6f8..475c2e87 100644 --- a/lib/ace/theme/ambiance.js +++ b/lib/ace/theme/ambiance.js @@ -25,7 +25,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-ambiance"; -exports.cssText = require("ace/requirejs/text!./ambiance.css"); +exports.cssText = require("../requirejs/text!./ambiance.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/chrome.js b/lib/ace/theme/chrome.js index b0d02480..dafa99c2 100644 --- a/lib/ace/theme/chrome.js +++ b/lib/ace/theme/chrome.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = false; exports.cssClass = "ace-chrome"; -exports.cssText = require('ace/requirejs/text!./chrome.css'); +exports.cssText = require("../requirejs/text!./chrome.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/clouds.js b/lib/ace/theme/clouds.js index 13d66603..f9b7c6bf 100644 --- a/lib/ace/theme/clouds.js +++ b/lib/ace/theme/clouds.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = false; exports.cssClass = "ace-clouds"; -exports.cssText = require('ace/requirejs/text!./clouds.css'); +exports.cssText = require("../requirejs/text!./clouds.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/clouds_midnight.js b/lib/ace/theme/clouds_midnight.js index 9359d120..a7b76d65 100644 --- a/lib/ace/theme/clouds_midnight.js +++ b/lib/ace/theme/clouds_midnight.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-clouds-midnight"; -exports.cssText = require('ace/requirejs/text!./clouds_midnight.css'); +exports.cssText = require("../requirejs/text!./clouds_midnight.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/cobalt.js b/lib/ace/theme/cobalt.js index 0964e9a6..6e2f3d0a 100644 --- a/lib/ace/theme/cobalt.js +++ b/lib/ace/theme/cobalt.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-cobalt"; -exports.cssText = require('ace/requirejs/text!./cobalt.css'); +exports.cssText = require("../requirejs/text!./cobalt.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/crimson_editor.js b/lib/ace/theme/crimson_editor.js index 943930d9..a5971075 100644 --- a/lib/ace/theme/crimson_editor.js +++ b/lib/ace/theme/crimson_editor.js @@ -30,7 +30,7 @@ define(function(require, exports, module) { exports.isDark = false; -exports.cssText = require('ace/requirejs/text!./crimson_editor.css'); +exports.cssText = require("../requirejs/text!./crimson_editor.css"); exports.cssClass = "ace-crimson-editor"; diff --git a/lib/ace/theme/dawn.js b/lib/ace/theme/dawn.js index 88b5ae38..f31f00b8 100644 --- a/lib/ace/theme/dawn.js +++ b/lib/ace/theme/dawn.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = false; exports.cssClass = "ace-dawn"; -exports.cssText = require('ace/requirejs/text!./dawn.css'); +exports.cssText = require("../requirejs/text!./dawn.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/dreamweaver.js b/lib/ace/theme/dreamweaver.js index 25a7fcba..943dc692 100644 --- a/lib/ace/theme/dreamweaver.js +++ b/lib/ace/theme/dreamweaver.js @@ -31,7 +31,7 @@ define(function(require, exports, module) { exports.isDark = false; exports.cssClass = "ace-dreamweaver"; -exports.cssText = require('ace/requirejs/text!./dreamweaver.css'); +exports.cssText = require("../requirejs/text!./dreamweaver.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/eclipse.js b/lib/ace/theme/eclipse.js index aabeeab2..329b8b79 100644 --- a/lib/ace/theme/eclipse.js +++ b/lib/ace/theme/eclipse.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { "use strict"; exports.isDark = false; -exports.cssText = require('ace/requirejs/text!./eclipse.css'); +exports.cssText = require("../requirejs/text!./eclipse.css"); exports.cssClass = "ace-eclipse"; diff --git a/lib/ace/theme/github.js b/lib/ace/theme/github.js index b5839dd4..de013c8c 100644 --- a/lib/ace/theme/github.js +++ b/lib/ace/theme/github.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = false; exports.cssClass = "ace-github"; -exports.cssText = require('ace/requirejs/text!./github.css'); +exports.cssText = require("../requirejs/text!./github.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/idle_fingers.js b/lib/ace/theme/idle_fingers.js index fcb3be31..5da497f0 100644 --- a/lib/ace/theme/idle_fingers.js +++ b/lib/ace/theme/idle_fingers.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-idle-fingers"; -exports.cssText = require('ace/requirejs/text!./idle_fingers.css'); +exports.cssText = require("../requirejs/text!./idle_fingers.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/kr_theme.js b/lib/ace/theme/kr_theme.js index 81faf395..2018a962 100644 --- a/lib/ace/theme/kr_theme.js +++ b/lib/ace/theme/kr_theme.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-kr-theme"; -exports.cssText = require('ace/requirejs/text!./kr_theme.css'); +exports.cssText = require("../requirejs/text!./kr_theme.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/merbivore.js b/lib/ace/theme/merbivore.js index bba49410..699fb2eb 100644 --- a/lib/ace/theme/merbivore.js +++ b/lib/ace/theme/merbivore.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-merbivore"; -exports.cssText = require('ace/requirejs/text!./merbivore.css'); +exports.cssText = require("../requirejs/text!./merbivore.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/merbivore_soft.js b/lib/ace/theme/merbivore_soft.js index 5848e289..873a6023 100644 --- a/lib/ace/theme/merbivore_soft.js +++ b/lib/ace/theme/merbivore_soft.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-merbivore-soft"; -exports.cssText = require('ace/requirejs/text!./merbivore_soft.css'); +exports.cssText = require("../requirejs/text!./merbivore_soft.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/mono_industrial.css b/lib/ace/theme/mono_industrial.css index 09c765b4..b5eb68b2 100644 --- a/lib/ace/theme/mono_industrial.css +++ b/lib/ace/theme/mono_industrial.css @@ -135,4 +135,4 @@ .ace-mono-industrial .ace_indent-guide { background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNQ0tH4zzBz5sz/ABAOBECKH+evAAAAAElFTkSuQmCC) right repeat-y -} +} \ No newline at end of file diff --git a/lib/ace/theme/mono_industrial.js b/lib/ace/theme/mono_industrial.js index 288cd710..af763292 100644 --- a/lib/ace/theme/mono_industrial.js +++ b/lib/ace/theme/mono_industrial.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-mono-industrial"; -exports.cssText = require('ace/requirejs/text!./mono_industrial.css'); +exports.cssText = require("../requirejs/text!./mono_industrial.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/monokai.js b/lib/ace/theme/monokai.js index fe4283c6..a33326bd 100644 --- a/lib/ace/theme/monokai.js +++ b/lib/ace/theme/monokai.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-monokai"; -exports.cssText = require('ace/requirejs/text!./monokai.css'); +exports.cssText = require("../requirejs/text!./monokai.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/pastel_on_dark.js b/lib/ace/theme/pastel_on_dark.js index 93776772..5c11fd4c 100644 --- a/lib/ace/theme/pastel_on_dark.js +++ b/lib/ace/theme/pastel_on_dark.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-pastel-on-dark"; -exports.cssText = require('ace/requirejs/text!./pastel_on_dark.css'); +exports.cssText = require("../requirejs/text!./pastel_on_dark.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/solarized_dark.js b/lib/ace/theme/solarized_dark.js index f2ef096b..d7ad4f90 100644 --- a/lib/ace/theme/solarized_dark.js +++ b/lib/ace/theme/solarized_dark.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-solarized-dark"; -exports.cssText = require('ace/requirejs/text!./solarized_dark.css'); +exports.cssText = require("../requirejs/text!./solarized_dark.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/solarized_light.js b/lib/ace/theme/solarized_light.js index a8e9e10f..eda2c45c 100644 --- a/lib/ace/theme/solarized_light.js +++ b/lib/ace/theme/solarized_light.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = false; exports.cssClass = "ace-solarized-light"; -exports.cssText = require('ace/requirejs/text!./solarized_light.css'); +exports.cssText = require("../requirejs/text!./solarized_light.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/textmate.js b/lib/ace/theme/textmate.js index 47bbae0b..75e19745 100644 --- a/lib/ace/theme/textmate.js +++ b/lib/ace/theme/textmate.js @@ -33,7 +33,7 @@ define(function(require, exports, module) { exports.isDark = false; exports.cssClass = "ace-tm"; -exports.cssText = require('ace/requirejs/text!./textmate.css'); +exports.cssText = require("../requirejs/text!./textmate.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/tomorrow.js b/lib/ace/theme/tomorrow.js index acf984f9..603c92a5 100644 --- a/lib/ace/theme/tomorrow.js +++ b/lib/ace/theme/tomorrow.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = false; exports.cssClass = "ace-tomorrow"; -exports.cssText = require('ace/requirejs/text!./tomorrow.css'); +exports.cssText = require("../requirejs/text!./tomorrow.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/tomorrow_night.js b/lib/ace/theme/tomorrow_night.js index f3fcdbc9..8a2454ea 100644 --- a/lib/ace/theme/tomorrow_night.js +++ b/lib/ace/theme/tomorrow_night.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-tomorrow-night"; -exports.cssText = require('ace/requirejs/text!./tomorrow_night.css'); +exports.cssText = require("../requirejs/text!./tomorrow_night.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/tomorrow_night_blue.js b/lib/ace/theme/tomorrow_night_blue.js index 0b496d20..dafd1f53 100644 --- a/lib/ace/theme/tomorrow_night_blue.js +++ b/lib/ace/theme/tomorrow_night_blue.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-tomorrow-night-blue"; -exports.cssText = require('ace/requirejs/text!./tomorrow_night_blue.css'); +exports.cssText = require("../requirejs/text!./tomorrow_night_blue.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/tomorrow_night_bright.js b/lib/ace/theme/tomorrow_night_bright.js index 18bc4aa9..12c961ef 100644 --- a/lib/ace/theme/tomorrow_night_bright.js +++ b/lib/ace/theme/tomorrow_night_bright.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-tomorrow-night-bright"; -exports.cssText = require('ace/requirejs/text!./tomorrow_night_bright.css'); +exports.cssText = require("../requirejs/text!./tomorrow_night_bright.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/tomorrow_night_eighties.js b/lib/ace/theme/tomorrow_night_eighties.js index 8217cdbd..fc2cd15c 100644 --- a/lib/ace/theme/tomorrow_night_eighties.js +++ b/lib/ace/theme/tomorrow_night_eighties.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-tomorrow-night-eighties"; -exports.cssText = require('ace/requirejs/text!./tomorrow_night_eighties.css'); +exports.cssText = require("../requirejs/text!./tomorrow_night_eighties.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/twilight.js b/lib/ace/theme/twilight.js index 5c1d3eef..216f09de 100644 --- a/lib/ace/theme/twilight.js +++ b/lib/ace/theme/twilight.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-twilight"; -exports.cssText = require('ace/requirejs/text!./twilight.css'); +exports.cssText = require("../requirejs/text!./twilight.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/vibrant_ink.js b/lib/ace/theme/vibrant_ink.js index 584f8d29..b41b1d47 100644 --- a/lib/ace/theme/vibrant_ink.js +++ b/lib/ace/theme/vibrant_ink.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = true; exports.cssClass = "ace-vibrant-ink"; -exports.cssText = require('ace/requirejs/text!./vibrant_ink.css'); +exports.cssText = require("../requirejs/text!./vibrant_ink.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/theme/xcode.js b/lib/ace/theme/xcode.js index c6cba5b9..19827338 100644 --- a/lib/ace/theme/xcode.js +++ b/lib/ace/theme/xcode.js @@ -32,7 +32,7 @@ define(function(require, exports, module) { exports.isDark = false; exports.cssClass = "ace-xcode"; -exports.cssText = require('ace/requirejs/text!./xcode.css'); +exports.cssText = require("../requirejs/text!./xcode.css"); var dom = require("../lib/dom"); dom.importCssString(exports.cssText, exports.cssClass); diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js index fbb1661c..757db95c 100644 --- a/lib/ace/virtual_renderer.js +++ b/lib/ace/virtual_renderer.js @@ -44,7 +44,7 @@ var CursorLayer = require("./layer/cursor").Cursor; var ScrollBar = require("./scrollbar").ScrollBar; var RenderLoop = require("./renderloop").RenderLoop; var EventEmitter = require("./lib/event_emitter").EventEmitter; -var editorCss = require("ace/requirejs/text!./css/editor.css"); +var editorCss = require("./requirejs/text!./css/editor.css"); dom.importCssString(editorCss, "ace_editor"); diff --git a/tool/tmtheme.js b/tool/tmtheme.js index 39570e05..ab40d4a5 100755 --- a/tool/tmtheme.js +++ b/tool/tmtheme.js @@ -278,7 +278,7 @@ function convertTheme(name) { var js = fillTemplate(jsTemplate, { name: name, - css: "require('ace/requirejs/text!./" + name + ".css')", // quoteString(css), // + css: 'require("../requirejs/text!./' + name + '.css")', // quoteString(css), // cssClass: "ace-" + hyphenate(name), isDark: styles.isDark });