From c043d14b8bd2062b673886d10b1bd9c5eb8be65e Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Wed, 9 Nov 2011 15:38:53 +0100 Subject: [PATCH] use relative module ids to please node.js --- Makefile.dryice.js | 21 +---- kitchen-sink.html | 2 +- lib/ace/ace.js | 16 ++-- lib/ace/anchor.js | 4 +- lib/ace/anchor_test.js | 10 +-- lib/ace/background_tokenizer.js | 4 +- lib/ace/commands/command_manager.js | 4 +- lib/ace/commands/default_commands.js | 2 +- lib/ace/document.js | 8 +- lib/ace/document_test.js | 10 +-- lib/ace/edit_session.js | 18 ++--- lib/ace/edit_session/fold_line.js | 2 +- lib/ace/edit_session/folding.js | 6 +- lib/ace/edit_session_test.js | 18 ++--- lib/ace/editor.js | 30 +++---- lib/ace/editor_change_document_test.js | 16 ++-- .../editor_highlight_selected_word_test.js | 14 ++-- lib/ace/editor_navigation_test.js | 12 +-- lib/ace/editor_text_edit_test.js | 16 ++-- lib/ace/ext/static_highlight.js | 6 +- lib/ace/ext/static_highlight_test.js | 14 ++-- lib/ace/keyboard/hash_handler.js | 2 +- lib/ace/keyboard/keybinding.js | 8 +- lib/ace/keyboard/keybinding/emacs.js | 4 +- lib/ace/keyboard/keybinding/vim.js | 4 +- lib/ace/keyboard/textinput.js | 14 ++-- lib/ace/layer/cursor.js | 2 +- lib/ace/layer/gutter.js | 2 +- lib/ace/layer/marker.js | 4 +- lib/ace/layer/text.js | 10 +-- lib/ace/layer/text_test.js | 12 +-- lib/ace/lib/browser_focus.js | 6 +- lib/ace/lib/event.js | 6 +- lib/ace/{test => lib}/event_emitter_test.js | 8 +- lib/ace/lib/fixoldbrowsers.js | 4 +- lib/ace/lib/keys.js | 2 +- lib/ace/mode/behaviour/cstyle.js | 4 +- lib/ace/mode/behaviour/xml.js | 6 +- lib/ace/mode/c_cpp.js | 14 ++-- lib/ace/mode/c_cpp_highlight_rules.js | 8 +- lib/ace/mode/clojure.js | 12 +-- lib/ace/mode/clojure_highlight_rules.js | 6 +- lib/ace/mode/coffee.js | 14 ++-- lib/ace/mode/coffee/coffee-script.js | 6 +- lib/ace/mode/coffee/lexer.js | 4 +- lib/ace/mode/coffee/nodes.js | 4 +- lib/ace/mode/coffee/parser_test.js | 6 +- lib/ace/mode/coffee/scope.js | 2 +- lib/ace/mode/coffee_highlight_rules.js | 6 +- lib/ace/mode/coffee_tokenizer_test.js | 6 +- lib/ace/mode/coffee_worker.js | 6 +- lib/ace/mode/coldfusion.js | 14 ++-- lib/ace/mode/coldfusion_highlight_rules.js | 8 +- lib/ace/mode/coldfusion_test.js | 10 +-- lib/ace/mode/csharp.js | 12 +-- lib/ace/mode/csharp_highlight_rules.js | 8 +- lib/ace/mode/css.js | 12 +-- lib/ace/mode/css_highlight_rules.js | 6 +- lib/ace/mode/css_test.js | 8 +- lib/ace/mode/css_tokenizer_test.js | 6 +- lib/ace/mode/css_worker.js | 6 +- lib/ace/mode/css_worker_test.js | 6 +- lib/ace/mode/doc_comment_highlight_rules.js | 4 +- lib/ace/mode/groovy.js | 12 +-- lib/ace/mode/groovy_highlight_rules.js | 8 +- lib/ace/mode/html.js | 14 ++-- lib/ace/mode/html_highlight_rules.js | 8 +- lib/ace/mode/html_test.js | 10 +-- lib/ace/mode/html_tokenizer_test.js | 8 +- lib/ace/mode/java.js | 12 +-- lib/ace/mode/java_highlight_rules.js | 8 +- lib/ace/mode/javascript.js | 16 ++-- lib/ace/mode/javascript_highlight_rules.js | 10 +-- lib/ace/mode/javascript_test.js | 10 +-- lib/ace/mode/javascript_tokenizer_test.js | 8 +- lib/ace/mode/javascript_worker.js | 9 +-- lib/ace/mode/javascript_worker_test.js | 6 +- lib/ace/mode/json.js | 14 ++-- lib/ace/mode/json_highlight_rules.js | 6 +- lib/ace/mode/latex.js | 10 +-- lib/ace/mode/latex_highlight_rules.js | 4 +- lib/ace/mode/lua.js | 10 +-- lib/ace/mode/lua_highlight_rules.js | 6 +- lib/ace/mode/markdown.js | 16 ++-- lib/ace/mode/markdown_highlight_rules.js | 12 +-- lib/ace/mode/matching_brace_outdent.js | 2 +- lib/ace/mode/matching_parens_outdent.js | 2 +- lib/ace/mode/ocaml.js | 12 +-- lib/ace/mode/ocaml_highlight_rules.js | 6 +- lib/ace/mode/perl.js | 12 +-- lib/ace/mode/perl_highlight_rules.js | 6 +- lib/ace/mode/php.js | 14 ++-- lib/ace/mode/php_highlight_rules.js | 8 +- lib/ace/mode/powershell.js | 56 ++++++------- lib/ace/mode/powershell_highlight_rules.js | 8 +- lib/ace/mode/python.js | 12 +-- lib/ace/mode/python_highlight_rules.js | 6 +- lib/ace/mode/python_test.js | 10 +-- lib/ace/mode/ruby.js | 12 +-- lib/ace/mode/ruby_highlight_rules.js | 6 +- lib/ace/mode/ruby_tokenizer_test.js | 6 +- lib/ace/mode/scad.js | 14 ++-- lib/ace/mode/scad_highlight_rules.js | 8 +- lib/ace/mode/scala.js | 12 +-- lib/ace/mode/scala_highlight_rules.js | 8 +- lib/ace/mode/scss.js | 10 +-- lib/ace/mode/scss_highlight_rules.js | 6 +- lib/ace/mode/sql.js | 81 ++++++++++--------- lib/ace/mode/sql_highlight_rules.js | 6 +- lib/ace/mode/svg.js | 12 +-- lib/ace/mode/svg_highlight_rules.js | 6 +- lib/ace/mode/text.js | 8 +- lib/ace/mode/text_highlight_rules.js | 2 +- lib/ace/mode/text_test.js | 8 +- lib/ace/mode/textile.js | 12 +-- lib/ace/mode/textile_highlight_rules.js | 4 +- lib/ace/mode/xml.js | 10 +-- lib/ace/mode/xml_highlight_rules.js | 4 +- lib/ace/mode/xml_test.js | 10 +-- lib/ace/mode/xml_tokenizer_test.js | 6 +- lib/ace/mouse/default_handlers.js | 8 +- lib/ace/mouse/mouse_event.js | 4 +- lib/ace/mouse/mouse_handler.js | 6 +- lib/ace/narcissus/jslex.js | 2 +- lib/ace/narcissus/jsparse.js | 4 +- lib/ace/range_test.js | 8 +- lib/ace/renderloop.js | 2 +- lib/ace/scrollbar.js | 8 +- lib/ace/search.js | 6 +- lib/ace/search_test.js | 8 +- lib/ace/selection.js | 8 +- lib/ace/selection_test.js | 18 +---- lib/ace/split.js | 14 ++-- lib/ace/test/all.js | 2 - lib/ace/test/benchmark.js | 6 +- lib/ace/virtual_renderer.js | 24 +++--- lib/ace/virtual_renderer_test.js | 10 +-- lib/ace/worker/mirror.js | 4 +- lib/ace/worker/worker.js | 1 + lib/ace/worker/worker_client.js | 4 +- 140 files changed, 633 insertions(+), 661 deletions(-) rename lib/ace/{test => lib}/event_emitter_test.js (92%) diff --git a/Makefile.dryice.js b/Makefile.dryice.js index f471ed11..cc76fcea 100755 --- a/Makefile.dryice.js +++ b/Makefile.dryice.js @@ -91,7 +91,7 @@ console.log('# ace ---------'); var aceProject = { roots: [ aceHome + '/lib', - aceHome + aceHome + '/demo' ], textPluginPattern: /^ace\/requirejs\/text!/ } @@ -354,29 +354,12 @@ function demo() { source: [ copy.source.commonjs({ project: project, - require: [ "demo/kitchen-sink/demo" ] + require: [ "kitchen-sink/demo" ] }) ], filter: [ copy.filter.moduleDefines ], dest: demo }); - copy({ - source: { - root: project, - include: /demo\/kitchen-sink\/docs\/.*$/, - }, - filter: [ copy.filter.addDefines ], - dest: demo - }); - copy({ - source: { - root: project, - include: /ace\/.*\.css$/, - }, - filter: [ copy.filter.addDefines ], - dest: demo - }); - copy({ source: demo, filter: [ filterTextPlugin ], diff --git a/kitchen-sink.html b/kitchen-sink.html index a8b6fe32..5351104d 100644 --- a/kitchen-sink.html +++ b/kitchen-sink.html @@ -201,7 +201,7 @@ diff --git a/lib/ace/ace.js b/lib/ace/ace.js index 4a32abfe..1805a934 100644 --- a/lib/ace/ace.js +++ b/lib/ace/ace.js @@ -37,15 +37,15 @@ define(function(require, exports, module) { - require("ace/lib/fixoldbrowsers"); + require("./lib/fixoldbrowsers"); - var Dom = require("ace/lib/dom"); - var Event = require("ace/lib/event"); + var Dom = require("./lib/dom"); + var Event = require("./lib/event"); - var Editor = require("ace/editor").Editor; - var EditSession = require("ace/edit_session").EditSession; - var UndoManager = require("ace/undomanager").UndoManager; - var Renderer = require("ace/virtual_renderer").VirtualRenderer; + var Editor = require("./editor").Editor; + var EditSession = require("./edit_session").EditSession; + var UndoManager = require("./undomanager").UndoManager; + var Renderer = require("./virtual_renderer").VirtualRenderer; exports.edit = function(el) { if (typeof(el) == "string") { @@ -56,7 +56,7 @@ define(function(require, exports, module) { doc.setUndoManager(new UndoManager()); el.innerHTML = ''; - var editor = new Editor(new Renderer(el, require("ace/theme/textmate"))); + var editor = new Editor(new Renderer(el, require("./theme/textmate"))); editor.setSession(doc); var env = {}; diff --git a/lib/ace/anchor.js b/lib/ace/anchor.js index caa732f2..56406b4a 100644 --- a/lib/ace/anchor.js +++ b/lib/ace/anchor.js @@ -37,8 +37,8 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var EventEmitter = require("ace/lib/event_emitter").EventEmitter; +var oop = require("./lib/oop"); +var EventEmitter = require("./lib/event_emitter").EventEmitter; /** * An Anchor is a floating pointer in the document. Whenever text is inserted or diff --git a/lib/ace/anchor_test.js b/lib/ace/anchor_test.js index 00073a54..462d6818 100644 --- a/lib/ace/anchor_test.js +++ b/lib/ace/anchor_test.js @@ -36,15 +36,15 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../support/paths"); + require("amd-loader"); } define(function(require, exports, module) { -var Document = require("ace/document").Document; -var Anchor = require("ace/anchor").Anchor; -var Range = require("ace/range").Range; -var assert = require("ace/test/assertions"); +var Document = require("./document").Document; +var Anchor = require("./anchor").Anchor; +var Range = require("./range").Range; +var assert = require("./test/assertions"); module.exports = { diff --git a/lib/ace/background_tokenizer.js b/lib/ace/background_tokenizer.js index 96688b2f..0ee8990c 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 EventEmitter = require("ace/lib/event_emitter").EventEmitter; +var oop = require("./lib/oop"); +var EventEmitter = require("./lib/event_emitter").EventEmitter; var BackgroundTokenizer = function(tokenizer, editor) { this.running = false; diff --git a/lib/ace/commands/command_manager.js b/lib/ace/commands/command_manager.js index 36b7c273..a9e3bd9f 100644 --- a/lib/ace/commands/command_manager.js +++ b/lib/ace/commands/command_manager.js @@ -1,7 +1,7 @@ define(function(require, exports, module) { -var keyUtil = require("ace/lib/keys"); -var useragent = require("ace/lib/useragent"); +var keyUtil = require("../lib/keys"); +var useragent = require("../lib/useragent"); var CommandManager = function(commands) { this.commands = {}; diff --git a/lib/ace/commands/default_commands.js b/lib/ace/commands/default_commands.js index 56f6e714..54a3f473 100644 --- a/lib/ace/commands/default_commands.js +++ b/lib/ace/commands/default_commands.js @@ -40,7 +40,7 @@ define(function(require, exports, module) { -var lang = require("ace/lib/lang"); +var lang = require("../lib/lang"); function bindKey(win, mac) { return { diff --git a/lib/ace/document.js b/lib/ace/document.js index 23408c5b..57369346 100644 --- a/lib/ace/document.js +++ b/lib/ace/document.js @@ -37,10 +37,10 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var EventEmitter = require("ace/lib/event_emitter").EventEmitter; -var Range = require("ace/range").Range; -var Anchor = require("ace/anchor").Anchor; +var oop = require("./lib/oop"); +var EventEmitter = require("./lib/event_emitter").EventEmitter; +var Range = require("./range").Range; +var Anchor = require("./anchor").Anchor; var Document = function(text) { this.$lines = []; diff --git a/lib/ace/document_test.js b/lib/ace/document_test.js index 1a7587a8..d53b7fc8 100644 --- a/lib/ace/document_test.js +++ b/lib/ace/document_test.js @@ -37,15 +37,15 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../support/paths"); - require("ace/test/mockdom"); + require("amd-loader"); + require("./test/mockdom"); } define(function(require, exports, module) { -var Document = require("ace/document").Document; -var Range = require("ace/range").Range; -var assert = require("ace/test/assertions"); +var Document = require("./document").Document; +var Range = require("./range").Range; +var assert = require("./test/assertions"); module.exports = { diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js index 863bdc34..260c420f 100644 --- a/lib/ace/edit_session.js +++ b/lib/ace/edit_session.js @@ -40,14 +40,14 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var lang = require("ace/lib/lang"); -var EventEmitter = require("ace/lib/event_emitter").EventEmitter; -var Selection = require("ace/selection").Selection; -var TextMode = require("ace/mode/text").Mode; -var Range = require("ace/range").Range; -var Document = require("ace/document").Document; -var BackgroundTokenizer = require("ace/background_tokenizer").BackgroundTokenizer; +var oop = require("./lib/oop"); +var lang = require("./lib/lang"); +var EventEmitter = require("./lib/event_emitter").EventEmitter; +var Selection = require("./selection").Selection; +var TextMode = require("./mode/text").Mode; +var Range = require("./range").Range; +var Document = require("./document").Document; +var BackgroundTokenizer = require("./background_tokenizer").BackgroundTokenizer; var EditSession = function(text, mode) { this.$modified = true; @@ -1735,7 +1735,7 @@ var EditSession = function(text, mode) { }).call(EditSession.prototype); -require("ace/edit_session/folding").Folding.call(EditSession.prototype); +require("./edit_session/folding").Folding.call(EditSession.prototype); exports.EditSession = EditSession; }); diff --git a/lib/ace/edit_session/fold_line.js b/lib/ace/edit_session/fold_line.js index 7e017a8c..03017b9a 100644 --- a/lib/ace/edit_session/fold_line.js +++ b/lib/ace/edit_session/fold_line.js @@ -38,7 +38,7 @@ define(function(require, exports, module) { -var Range = require("ace/range").Range; +var Range = require("../range").Range; /** * If the an array is passed in, the folds are expected to be sorted already. diff --git a/lib/ace/edit_session/folding.js b/lib/ace/edit_session/folding.js index 1e6e357c..ae53a377 100644 --- a/lib/ace/edit_session/folding.js +++ b/lib/ace/edit_session/folding.js @@ -38,9 +38,9 @@ define(function(require, exports, module) { -var Range = require("ace/range").Range; -var FoldLine = require("ace/edit_session/fold_line").FoldLine; -var Fold = require("ace/edit_session/fold").Fold; +var Range = require("../range").Range; +var FoldLine = require("./fold_line").FoldLine; +var Fold = require("./fold").Fold; function Folding() { /** diff --git a/lib/ace/edit_session_test.js b/lib/ace/edit_session_test.js index 0b274b75..08bb12a5 100644 --- a/lib/ace/edit_session_test.js +++ b/lib/ace/edit_session_test.js @@ -37,19 +37,19 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../support/paths"); - require("ace/test/mockdom"); + require("amd-loader"); + require("./test/mockdom"); } define(function(require, exports, module) { -var lang = require("ace/lib/lang"); -var EditSession = require("ace/edit_session").EditSession; -var Editor = require("ace/editor").Editor; -var UndoManager = require("ace/undomanager").UndoManager; -var MockRenderer = require("ace/test/mockrenderer").MockRenderer; -var Range = require("ace/range").Range; -var assert = require("ace/test/assertions"); +var lang = require("./lib/lang"); +var EditSession = require("./edit_session").EditSession; +var Editor = require("./editor").Editor; +var UndoManager = require("./undomanager").UndoManager; +var MockRenderer = require("./test/mockrenderer").MockRenderer; +var Range = require("./range").Range; +var assert = require("./test/assertions"); function createFoldTestSession() { var lines = [ diff --git a/lib/ace/editor.js b/lib/ace/editor.js index 95cc6ba6..3f30b9c2 100644 --- a/lib/ace/editor.js +++ b/lib/ace/editor.js @@ -40,22 +40,22 @@ define(function(require, exports, module) { -require("ace/lib/fixoldbrowsers"); +require("./lib/fixoldbrowsers"); -var oop = require("ace/lib/oop"); -var event = require("ace/lib/event"); -var lang = require("ace/lib/lang"); -var useragent = require("ace/lib/useragent"); -var TextInput = require("ace/keyboard/textinput").TextInput; -var MouseHandler = require("ace/mouse/mouse_handler").MouseHandler; -//var TouchHandler = require("ace/touch_handler").TouchHandler; -var KeyBinding = require("ace/keyboard/keybinding").KeyBinding; -var EditSession = require("ace/edit_session").EditSession; -var Search = require("ace/search").Search; -var Range = require("ace/range").Range; -var EventEmitter = require("ace/lib/event_emitter").EventEmitter; -var CommandManager = require("ace/commands/command_manager").CommandManager; -var defaultCommands = require("ace/commands/default_commands").commands; +var oop = require("./lib/oop"); +var event = require("./lib/event"); +var lang = require("./lib/lang"); +var useragent = require("./lib/useragent"); +var TextInput = require("./keyboard/textinput").TextInput; +var MouseHandler = require("./mouse/mouse_handler").MouseHandler; +//var TouchHandler = require("./touch_handler").TouchHandler; +var KeyBinding = require("./keyboard/keybinding").KeyBinding; +var EditSession = require("./edit_session").EditSession; +var Search = require("./search").Search; +var Range = require("./range").Range; +var EventEmitter = require("./lib/event_emitter").EventEmitter; +var CommandManager = require("./commands/command_manager").CommandManager; +var defaultCommands = require("./commands/default_commands").commands; var Editor = function(renderer, session) { var container = renderer.getContainerElement(); diff --git a/lib/ace/editor_change_document_test.js b/lib/ace/editor_change_document_test.js index 20cd96d8..3df2f571 100644 --- a/lib/ace/editor_change_document_test.js +++ b/lib/ace/editor_change_document_test.js @@ -36,18 +36,18 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../support/paths"); - require("ace/test/mockdom"); + require("amd-loader"); + require("./test/mockdom"); } define(function(require, exports, module) { -var EditSession = require("ace/edit_session").EditSession; -var Editor = require("ace/editor").Editor; -var Text = require("ace/mode/text").Mode; -var JavaScriptMode = require("ace/mode/javascript").Mode; -var MockRenderer = require("ace/test/mockrenderer").MockRenderer; -var assert = require("ace/test/assertions"); +var EditSession = require("./edit_session").EditSession; +var Editor = require("./editor").Editor; +var Text = require("./mode/text").Mode; +var JavaScriptMode = require("./mode/javascript").Mode; +var MockRenderer = require("./test/mockrenderer").MockRenderer; +var assert = require("./test/assertions"); module.exports = { diff --git a/lib/ace/editor_highlight_selected_word_test.js b/lib/ace/editor_highlight_selected_word_test.js index d29056c7..4d1f1a0a 100644 --- a/lib/ace/editor_highlight_selected_word_test.js +++ b/lib/ace/editor_highlight_selected_word_test.js @@ -37,17 +37,17 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../support/paths"); - require("ace/test/mockdom"); + require("amd-loader"); + require("./test/mockdom"); } define(function(require, exports, module) { -var EditSession = require("ace/edit_session").EditSession; -var Editor = require("ace/editor").Editor; -var MockRenderer = require("ace/test/mockrenderer").MockRenderer; -var TextMode = require("ace/mode/text").Mode; -var assert = require("ace/test/assertions"); +var EditSession = require("./edit_session").EditSession; +var Editor = require("./editor").Editor; +var MockRenderer = require("./test/mockrenderer").MockRenderer; +var TextMode = require("./mode/text").Mode; +var assert = require("./test/assertions"); var lipsum = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. " + "Mauris at arcu mi, eu lobortis mauris. Quisque ut libero eget " + diff --git a/lib/ace/editor_navigation_test.js b/lib/ace/editor_navigation_test.js index 0c219649..adcfba5b 100644 --- a/lib/ace/editor_navigation_test.js +++ b/lib/ace/editor_navigation_test.js @@ -36,16 +36,16 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../support/paths"); - require("ace/test/mockdom"); + require("amd-loader"); + require("./test/mockdom"); } define(function(require, exports, module) { -var EditSession = require("ace/edit_session").EditSession; -var Editor = require("ace/editor").Editor; -var MockRenderer = require("ace/test/mockrenderer").MockRenderer; -var assert = require("ace/test/assertions"); +var EditSession = require("./edit_session").EditSession; +var Editor = require("./editor").Editor; +var MockRenderer = require("./test/mockrenderer").MockRenderer; +var assert = require("./test/assertions"); module.exports = { createEditSession : function(rows, cols) { diff --git a/lib/ace/editor_text_edit_test.js b/lib/ace/editor_text_edit_test.js index dd9408d4..18cf0a96 100644 --- a/lib/ace/editor_text_edit_test.js +++ b/lib/ace/editor_text_edit_test.js @@ -36,18 +36,18 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../support/paths"); - require("ace/test/mockdom"); + require("amd-loader"); + require("./test/mockdom"); } define(function(require, exports, module) { -var EditSession = require("ace/edit_session").EditSession; -var Editor = require("ace/editor").Editor; -var JavaScriptMode = require("ace/mode/javascript").Mode; -var UndoManager = require("ace/undomanager").UndoManager; -var MockRenderer = require("ace/test/mockrenderer").MockRenderer; -var assert = require("ace/test/assertions"); +var EditSession = require("./edit_session").EditSession; +var Editor = require("./editor").Editor; +var JavaScriptMode = require("./mode/javascript").Mode; +var UndoManager = require("./undomanager").UndoManager; +var MockRenderer = require("./test/mockrenderer").MockRenderer; +var assert = require("./test/assertions"); module.exports = { "test: delete line from the middle" : function() { diff --git a/lib/ace/ext/static_highlight.js b/lib/ace/ext/static_highlight.js index bcdf10eb..6a7816db 100644 --- a/lib/ace/ext/static_highlight.js +++ b/lib/ace/ext/static_highlight.js @@ -39,9 +39,9 @@ define(function(require, exports, module) { -var EditSession = require("ace/edit_session").EditSession; -var TextLayer = require("ace/layer/text").Text; -var baseStyles = require("ace/requirejs/text!ace/ext/static.css"); +var EditSession = require("../edit_session").EditSession; +var TextLayer = require("../layer/text").Text; +var baseStyles = require("../requirejs/text!./static.css"); /** Transforms a given input code snippet into HTML using the given mode * diff --git a/lib/ace/ext/static_highlight_test.js b/lib/ace/ext/static_highlight_test.js index e2658073..bba4b539 100644 --- a/lib/ace/ext/static_highlight_test.js +++ b/lib/ace/ext/static_highlight_test.js @@ -1,18 +1,18 @@ if (typeof process !== "undefined") { - require("../../../support/paths"); - require("ace/test/mockdom"); + require("amd-loader"); + require("../test/mockdom"); } var assert = require("assert"); var highlighter = require("./static_highlight"); -var JavaScriptMode = require("ace/mode/javascript").Mode; +var JavaScriptMode = require("../mode/javascript").Mode; // Execution ORDER: test.setUpSuite, setUp, testFn, tearDown, test.tearDownSuite module.exports = { timeout: 10000, "test simple snippet": function(next) { - var theme = require("ace/theme/tomorrow"); + var theme = require("../theme/tomorrow"); var snippet = "/** this is a function\n\ *\n\ */\n\ @@ -36,7 +36,7 @@ function hello (a, b, c) {\n\ }, "test css from theme is used": function(next) { - var theme = require("ace/theme/tomorrow"); + var theme = require("../theme/tomorrow"); var snippet = "/** this is a function\n\ *\n\ */\n\ @@ -48,13 +48,13 @@ function hello (a, b, c) {\n\ var isError = false, result; result = highlighter.render(snippet, mode, theme); - assert.equal(result.css, theme.cssText); + assert.ok(result.css.indexOf(theme.cssText) !== -1); next(); }, "test theme classname should be in output html": function (next) { - var theme = require("ace/theme/tomorrow"); + var theme = require("../theme/tomorrow"); var snippet = "/** this is a function\n\ *\n\ */\n\ diff --git a/lib/ace/keyboard/hash_handler.js b/lib/ace/keyboard/hash_handler.js index d06374d3..f211b8fc 100644 --- a/lib/ace/keyboard/hash_handler.js +++ b/lib/ace/keyboard/hash_handler.js @@ -38,7 +38,7 @@ define(function(require, exports, module) { -var keyUtil = require("ace/lib/keys"); +var keyUtil = require("../lib/keys"); function HashHandler(config) { this.setConfig(config); diff --git a/lib/ace/keyboard/keybinding.js b/lib/ace/keyboard/keybinding.js index f8b640bc..5df14ef3 100644 --- a/lib/ace/keyboard/keybinding.js +++ b/lib/ace/keyboard/keybinding.js @@ -38,10 +38,10 @@ define(function(require, exports, module) { -var useragent = require("ace/lib/useragent"); -var keyUtil = require("ace/lib/keys"); -var event = require("ace/lib/event"); -require("ace/commands/default_commands"); +var useragent = require("../lib/useragent"); +var keyUtil = require("../lib/keys"); +var event = require("../lib/event"); +require("../commands/default_commands"); var KeyBinding = function(editor) { this.$editor = editor; diff --git a/lib/ace/keyboard/keybinding/emacs.js b/lib/ace/keyboard/keybinding/emacs.js index ce0cbc06..c017c8ed 100644 --- a/lib/ace/keyboard/keybinding/emacs.js +++ b/lib/ace/keyboard/keybinding/emacs.js @@ -37,8 +37,8 @@ define(function(require, exports, module) { -var StateHandler = require("ace/keyboard/state_handler").StateHandler; -var matchCharacterOnly = require("ace/keyboard/state_handler").matchCharacterOnly; +var StateHandler = require("../state_handler").StateHandler; +var matchCharacterOnly = require("../state_handler").matchCharacterOnly; var emacsState = { start: [ diff --git a/lib/ace/keyboard/keybinding/vim.js b/lib/ace/keyboard/keybinding/vim.js index 90c7dc15..599afa07 100644 --- a/lib/ace/keyboard/keybinding/vim.js +++ b/lib/ace/keyboard/keybinding/vim.js @@ -37,8 +37,8 @@ define(function(require, exports, module) { -var StateHandler = require("ace/keyboard/state_handler").StateHandler; -var matchCharacterOnly = require("ace/keyboard/state_handler").matchCharacterOnly; +var StateHandler = require("../state_handler").StateHandler; +var matchCharacterOnly = require("../state_handler").matchCharacterOnly; var vimcommand = function(key, exec, then) { return { diff --git a/lib/ace/keyboard/textinput.js b/lib/ace/keyboard/textinput.js index 273c677d..fabb4ca3 100644 --- a/lib/ace/keyboard/textinput.js +++ b/lib/ace/keyboard/textinput.js @@ -39,9 +39,9 @@ define(function(require, exports, module) { -var event = require("ace/lib/event"); -var useragent = require("ace/lib/useragent"); -var dom = require("ace/lib/dom"); +var event = require("../lib/event"); +var useragent = require("../lib/useragent"); +var dom = require("../lib/dom"); var TextInput = function(parentNode, host) { @@ -249,10 +249,12 @@ var TextInput = function(parentNode, host) { this.onContextMenu = function(mousePos, isEmpty){ if (mousePos) { - if(!tempStyle) + if (!tempStyle) tempStyle = text.style.cssText; - text.style.cssText = 'position:fixed; z-index:1000;' + - 'left:' + (mousePos.x - 2) + 'px; top:' + (mousePos.y - 2) + 'px;' + + text.style.cssText = + 'position:fixed; z-index:1000;' + + 'left:' + (mousePos.x - 2) + 'px; top:' + (mousePos.y - 2) + 'px;' } if (isEmpty) diff --git a/lib/ace/layer/cursor.js b/lib/ace/layer/cursor.js index ed9742a2..8dec094d 100644 --- a/lib/ace/layer/cursor.js +++ b/lib/ace/layer/cursor.js @@ -39,7 +39,7 @@ define(function(require, exports, module) { -var dom = require("ace/lib/dom"); +var dom = require("../lib/dom"); var Cursor = function(parentEl) { this.element = dom.createElement("div"); diff --git a/lib/ace/layer/gutter.js b/lib/ace/layer/gutter.js index 5427fe0e..f5f527f3 100644 --- a/lib/ace/layer/gutter.js +++ b/lib/ace/layer/gutter.js @@ -39,7 +39,7 @@ define(function(require, exports, module) { -var dom = require("ace/lib/dom"); +var dom = require("../lib/dom"); var Gutter = function(parentEl) { this.element = dom.createElement("div"); diff --git a/lib/ace/layer/marker.js b/lib/ace/layer/marker.js index fa51ebf8..ce8a5222 100644 --- a/lib/ace/layer/marker.js +++ b/lib/ace/layer/marker.js @@ -39,8 +39,8 @@ define(function(require, exports, module) { -var Range = require("ace/range").Range; -var dom = require("ace/lib/dom"); +var Range = require("../range").Range; +var dom = require("../lib/dom"); var Marker = function(parentEl) { this.element = dom.createElement("div"); diff --git a/lib/ace/layer/text.js b/lib/ace/layer/text.js index be6a051a..5fccd803 100644 --- a/lib/ace/layer/text.js +++ b/lib/ace/layer/text.js @@ -41,11 +41,11 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var dom = require("ace/lib/dom"); -var lang = require("ace/lib/lang"); -var useragent = require("ace/lib/useragent"); -var EventEmitter = require("ace/lib/event_emitter").EventEmitter; +var oop = require("../lib/oop"); +var dom = require("../lib/dom"); +var lang = require("../lib/lang"); +var useragent = require("../lib/useragent"); +var EventEmitter = require("../lib/event_emitter").EventEmitter; var Text = function(parentEl) { this.element = dom.createElement("div"); diff --git a/lib/ace/layer/text_test.js b/lib/ace/layer/text_test.js index bbd5d675..6d9d2fc3 100644 --- a/lib/ace/layer/text_test.js +++ b/lib/ace/layer/text_test.js @@ -36,16 +36,16 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); - require("ace/test/mockdom"); + require("amd-loader"); + require("../test/mockdom"); } define(function(require, exports, module) { -var assert = require("ace/test/assertions"); -var EditSession = require("ace/edit_session").EditSession; -var TextLayer = require("ace/layer/text").Text; -var JavaScriptMode = require("ace/mode/javascript").Mode; +var assert = require("../test/assertions"); +var EditSession = require("../edit_session").EditSession; +var TextLayer = require("./text").Text; +var JavaScriptMode = require("../mode/javascript").Mode; module.exports = { diff --git a/lib/ace/lib/browser_focus.js b/lib/ace/lib/browser_focus.js index a2493368..9ab17faa 100644 --- a/lib/ace/lib/browser_focus.js +++ b/lib/ace/lib/browser_focus.js @@ -40,9 +40,9 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var event = require("ace/lib/event"); -var EventEmitter = require("ace/lib/event_emitter").EventEmitter; +var oop = require("./oop"); +var event = require("./event"); +var EventEmitter = require("./event_emitter").EventEmitter; /** * This class keeps track of the focus state of the given window. diff --git a/lib/ace/lib/event.js b/lib/ace/lib/event.js index 242e1029..66e19d0f 100644 --- a/lib/ace/lib/event.js +++ b/lib/ace/lib/event.js @@ -37,9 +37,9 @@ define(function(require, exports, module) { -var keys = require("ace/lib/keys"); -var useragent = require("ace/lib/useragent"); -var dom = require("ace/lib/dom"); +var keys = require("./keys"); +var useragent = require("./useragent"); +var dom = require("./dom"); exports.addListener = function(elem, type, callback) { if (elem.addEventListener) { diff --git a/lib/ace/test/event_emitter_test.js b/lib/ace/lib/event_emitter_test.js similarity index 92% rename from lib/ace/test/event_emitter_test.js rename to lib/ace/lib/event_emitter_test.js index 3c94f582..176e874f 100644 --- a/lib/ace/test/event_emitter_test.js +++ b/lib/ace/lib/event_emitter_test.js @@ -36,14 +36,14 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("amd-loader"); } define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var EventEmitter = require("ace/lib/event_emitter").EventEmitter; -var assert = require("ace/test/assertions"); +var oop = require("../lib/oop"); +var EventEmitter = require("./event_emitter").EventEmitter; +var assert = require("../test/assertions"); var Emitter = function() {}; diff --git a/lib/ace/lib/fixoldbrowsers.js b/lib/ace/lib/fixoldbrowsers.js index 2d1b0bdd..127271b8 100644 --- a/lib/ace/lib/fixoldbrowsers.js +++ b/lib/ace/lib/fixoldbrowsers.js @@ -12,7 +12,7 @@ define(function(require, exports, module) { -require("ace/lib/regexp"); -require("ace/lib/es5-shim"); +require("./regexp"); +require("./es5-shim"); }); \ No newline at end of file diff --git a/lib/ace/lib/keys.js b/lib/ace/lib/keys.js index 8c64f895..ce9285e7 100644 --- a/lib/ace/lib/keys.js +++ b/lib/ace/lib/keys.js @@ -33,7 +33,7 @@ For more information about SproutCore, visit http://www.sproutcore.com define(function(require, exports, module) { -var oop = require("ace/lib/oop"); +var oop = require("./oop"); /** * Helper functions and hashes for key handling. diff --git a/lib/ace/mode/behaviour/cstyle.js b/lib/ace/mode/behaviour/cstyle.js index cd090826..292c3a11 100644 --- a/lib/ace/mode/behaviour/cstyle.js +++ b/lib/ace/mode/behaviour/cstyle.js @@ -38,8 +38,8 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var Behaviour = require('ace/mode/behaviour').Behaviour; +var oop = require("../../lib/oop"); +var Behaviour = require('../behaviour').Behaviour; var CstyleBehaviour = function () { diff --git a/lib/ace/mode/behaviour/xml.js b/lib/ace/mode/behaviour/xml.js index 38ecbb87..6aad0c5b 100644 --- a/lib/ace/mode/behaviour/xml.js +++ b/lib/ace/mode/behaviour/xml.js @@ -38,9 +38,9 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var Behaviour = require('ace/mode/behaviour').Behaviour; -var CstyleBehaviour = require('ace/mode/behaviour/cstyle').CstyleBehaviour; +var oop = require("../../lib/oop"); +var Behaviour = require("../behaviour").Behaviour; +var CstyleBehaviour = require("./cstyle").CstyleBehaviour; var XmlBehaviour = function () { diff --git a/lib/ace/mode/c_cpp.js b/lib/ace/mode/c_cpp.js index 04081c9c..0d141904 100644 --- a/lib/ace/mode/c_cpp.js +++ b/lib/ace/mode/c_cpp.js @@ -38,13 +38,13 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var c_cppHighlightRules = require("ace/mode/c_cpp_highlight_rules").c_cppHighlightRules; -var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent; -var Range = require("ace/range").Range; -var CstyleBehaviour = require("ace/mode/behaviour/cstyle").CstyleBehaviour; +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var c_cppHighlightRules = require("./c_cpp_highlight_rules").c_cppHighlightRules; +var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent; +var Range = require("../range").Range; +var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour; var Mode = function() { this.$tokenizer = new Tokenizer(new c_cppHighlightRules().getRules()); diff --git a/lib/ace/mode/c_cpp_highlight_rules.js b/lib/ace/mode/c_cpp_highlight_rules.js index 778300ed..83df5c57 100644 --- a/lib/ace/mode/c_cpp_highlight_rules.js +++ b/lib/ace/mode/c_cpp_highlight_rules.js @@ -40,10 +40,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").DocCommentHighlightRules; -var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules; +var oop = require("../lib/oop"); +var lang = require("../lib/lang"); +var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules; +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var c_cppHighlightRules = function() { diff --git a/lib/ace/mode/clojure.js b/lib/ace/mode/clojure.js index 3bd8127f..43f972d8 100644 --- a/lib/ace/mode/clojure.js +++ b/lib/ace/mode/clojure.js @@ -39,12 +39,12 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var ClojureHighlightRules = require("ace/mode/clojure_highlight_rules").ClojureHighlightRules; -var MatchingParensOutdent = require("ace/mode/matching_parens_outdent").MatchingParensOutdent; -var Range = require("ace/range").Range; +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var ClojureHighlightRules = require("./clojure_highlight_rules").ClojureHighlightRules; +var MatchingParensOutdent = require("./matching_parens_outdent").MatchingParensOutdent; +var Range = require("../range").Range; var Mode = function() { this.$tokenizer = new Tokenizer(new ClojureHighlightRules().getRules()); diff --git a/lib/ace/mode/clojure_highlight_rules.js b/lib/ace/mode/clojure_highlight_rules.js index 5ea1087e..261ea7c6 100644 --- a/lib/ace/mode/clojure_highlight_rules.js +++ b/lib/ace/mode/clojure_highlight_rules.js @@ -39,9 +39,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").TextHighlightRules; +var oop = require("../lib/oop"); +var lang = require("../lib/lang"); +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; diff --git a/lib/ace/mode/coffee.js b/lib/ace/mode/coffee.js index 82e342d6..7f10657d 100644 --- a/lib/ace/mode/coffee.js +++ b/lib/ace/mode/coffee.js @@ -37,13 +37,13 @@ define(function(require, exports, module) { -var Tokenizer = require("ace/tokenizer").Tokenizer; -var Rules = require("ace/mode/coffee_highlight_rules").CoffeeHighlightRules; -var Outdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent; -var Range = require("ace/range").Range; -var TextMode = require("ace/mode/text").Mode; -var WorkerClient = require("ace/worker/worker_client").WorkerClient; -var oop = require("ace/lib/oop"); +var Tokenizer = require("../tokenizer").Tokenizer; +var Rules = require("./coffee_highlight_rules").CoffeeHighlightRules; +var Outdent = require("./matching_brace_outdent").MatchingBraceOutdent; +var Range = require("../range").Range; +var TextMode = require("./text").Mode; +var WorkerClient = require("../worker/worker_client").WorkerClient; +var oop = require("../lib/oop"); function Mode() { this.$tokenizer = new Tokenizer(new Rules().getRules()); diff --git a/lib/ace/mode/coffee/coffee-script.js b/lib/ace/mode/coffee/coffee-script.js index f7ca2dc3..a2ebce73 100644 --- a/lib/ace/mode/coffee/coffee-script.js +++ b/lib/ace/mode/coffee/coffee-script.js @@ -37,8 +37,8 @@ define(function(require, exports, module) { - var Lexer = require("ace/mode/coffee/lexer").Lexer; - var parser = require("ace/mode/coffee/parser"); + var Lexer = require("./lexer").Lexer; + var parser = require("./parser"); var lexer = new Lexer(); parser.lexer = { @@ -55,7 +55,7 @@ define(function(require, exports, module) { return ""; } }; - parser.yy = require('ace/mode/coffee/nodes'); + parser.yy = require('./nodes'); exports.parse = function(code) { return parser.parse(lexer.tokenize(code)); diff --git a/lib/ace/mode/coffee/lexer.js b/lib/ace/mode/coffee/lexer.js index ab15ec43..e06066f4 100644 --- a/lib/ace/mode/coffee/lexer.js +++ b/lib/ace/mode/coffee/lexer.js @@ -32,8 +32,8 @@ define(function(require, exports, module) { } return -1; }; - Rewriter = require('ace/mode/coffee/rewriter').Rewriter; - _ref = require('ace/mode/coffee/helpers'), count = _ref.count, starts = _ref.starts, compact = _ref.compact, last = _ref.last; + Rewriter = require('./rewriter').Rewriter; + _ref = require('./helpers'), count = _ref.count, starts = _ref.starts, compact = _ref.compact, last = _ref.last; exports.Lexer = Lexer = (function() { function Lexer() {} Lexer.prototype.tokenize = function(code, opts) { diff --git a/lib/ace/mode/coffee/nodes.js b/lib/ace/mode/coffee/nodes.js index 9e2702ea..0fb53135 100644 --- a/lib/ace/mode/coffee/nodes.js +++ b/lib/ace/mode/coffee/nodes.js @@ -38,8 +38,8 @@ define(function(require, exports, module) { } return -1; }; - Scope = require('ace/mode/coffee/scope').Scope; - _ref = require('ace/mode/coffee/helpers'), compact = _ref.compact, flatten = _ref.flatten, extend = _ref.extend, merge = _ref.merge, del = _ref.del, starts = _ref.starts, ends = _ref.ends, last = _ref.last; + Scope = require('./scope').Scope; + _ref = require('./helpers'), compact = _ref.compact, flatten = _ref.flatten, extend = _ref.extend, merge = _ref.merge, del = _ref.del, starts = _ref.starts, ends = _ref.ends, last = _ref.last; exports.extend = extend; YES = function() { return true; diff --git a/lib/ace/mode/coffee/parser_test.js b/lib/ace/mode/coffee/parser_test.js index 11cae970..8921eee2 100644 --- a/lib/ace/mode/coffee/parser_test.js +++ b/lib/ace/mode/coffee/parser_test.js @@ -36,13 +36,13 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../../support/paths"); + require("amd-loader"); } define(function(require, exports, module) { -var assert = require("ace/test/assertions"); -var coffee = require("ace/mode/coffee/coffee-script"); +var assert = require("../../test/assertions"); +var coffee = require("../coffee/coffee-script"); module.exports = { diff --git a/lib/ace/mode/coffee/scope.js b/lib/ace/mode/coffee/scope.js index f0a30da9..2015c42d 100644 --- a/lib/ace/mode/coffee/scope.js +++ b/lib/ace/mode/coffee/scope.js @@ -25,7 +25,7 @@ define(function(require, exports, module) { var Scope, extend, last, _ref; - _ref = require('ace/mode/coffee/helpers'), extend = _ref.extend, last = _ref.last; + _ref = require('./helpers'), extend = _ref.extend, last = _ref.last; exports.Scope = Scope = (function() { Scope.root = null; function Scope(parent, expressions, method) { diff --git a/lib/ace/mode/coffee_highlight_rules.js b/lib/ace/mode/coffee_highlight_rules.js index 4565d32d..9bea4d58 100644 --- a/lib/ace/mode/coffee_highlight_rules.js +++ b/lib/ace/mode/coffee_highlight_rules.js @@ -37,9 +37,9 @@ define(function(require, exports, module) { - var lang = require("ace/lib/lang"); - var oop = require("ace/lib/oop"); - var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules; + var lang = require("../lib/lang"); + var oop = require("../lib/oop"); + var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; oop.inherits(CoffeeHighlightRules, TextHighlightRules); diff --git a/lib/ace/mode/coffee_tokenizer_test.js b/lib/ace/mode/coffee_tokenizer_test.js index 95c06381..9eeb55a2 100644 --- a/lib/ace/mode/coffee_tokenizer_test.js +++ b/lib/ace/mode/coffee_tokenizer_test.js @@ -36,13 +36,13 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("amd-loader"); } define(function(require, exports, module) { -var Mode = require("ace/mode/coffee").Mode; -var assert = require("ace/test/assertions"); +var Mode = require("./coffee").Mode; +var assert = require("../test/assertions"); module.exports = { setUp : function() { diff --git a/lib/ace/mode/coffee_worker.js b/lib/ace/mode/coffee_worker.js index ef39e0ac..473ae705 100644 --- a/lib/ace/mode/coffee_worker.js +++ b/lib/ace/mode/coffee_worker.js @@ -37,9 +37,9 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var Mirror = require("ace/worker/mirror").Mirror; -var coffee = require("ace/mode/coffee/coffee-script"); +var oop = require("../lib/oop"); +var Mirror = require("../worker/mirror").Mirror; +var coffee = require("../mode/coffee/coffee-script"); window.addEventListener = function() {}; diff --git a/lib/ace/mode/coldfusion.js b/lib/ace/mode/coldfusion.js index 11f82ee5..b33f3686 100644 --- a/lib/ace/mode/coldfusion.js +++ b/lib/ace/mode/coldfusion.js @@ -37,13 +37,13 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text").Mode; -var JavaScriptMode = require("ace/mode/javascript").Mode; -var CssMode = require("ace/mode/css").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var ColdfusionHighlightRules = require("ace/mode/coldfusion_highlight_rules").ColdfusionHighlightRules; -var XmlBehaviour = require("ace/mode/behaviour/xml").XmlBehaviour; +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var JavaScriptMode = require("./javascript").Mode; +var CssMode = require("./css").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var ColdfusionHighlightRules = require("./coldfusion_highlight_rules").ColdfusionHighlightRules; +var XmlBehaviour = require("./behaviour/xml").XmlBehaviour; var Mode = function() { var highlighter = new ColdfusionHighlightRules(); diff --git a/lib/ace/mode/coldfusion_highlight_rules.js b/lib/ace/mode/coldfusion_highlight_rules.js index d4329c77..c42246f7 100644 --- a/lib/ace/mode/coldfusion_highlight_rules.js +++ b/lib/ace/mode/coldfusion_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").CssHighlightRules; -var JavaScriptHighlightRules = require("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules; -var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules; +var oop = require("../lib/oop"); +var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules; +var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules; +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var ColdfusionHighlightRules = function() { diff --git a/lib/ace/mode/coldfusion_test.js b/lib/ace/mode/coldfusion_test.js index 7166c970..f96f8c2a 100644 --- a/lib/ace/mode/coldfusion_test.js +++ b/lib/ace/mode/coldfusion_test.js @@ -36,15 +36,15 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("amd-loader"); } define(function(require, exports, module) { -var EditSession = require("ace/edit_session").EditSession; -var Range = require("ace/range").Range; -var ColdfusionMode = require("ace/mode/coldfusion").Mode; -var assert = require("ace/test/assertions"); +var EditSession = require("../edit_session").EditSession; +var Range = require("../range").Range; +var ColdfusionMode = require("./coldfusion").Mode; +var assert = require("../test/assertions"); module.exports = { setUp : function() { diff --git a/lib/ace/mode/csharp.js b/lib/ace/mode/csharp.js index 5750d7d1..a5a8c27b 100644 --- a/lib/ace/mode/csharp.js +++ b/lib/ace/mode/csharp.js @@ -1,11 +1,11 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var CSharpHighlightRules = require("ace/mode/csharp_highlight_rules").CSharpHighlightRules; -var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent; -var CstyleBehaviour = require("ace/mode/behaviour/cstyle").CstyleBehaviour; +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var CSharpHighlightRules = require("./csharp_highlight_rules").CSharpHighlightRules; +var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent; +var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour; var Mode = function() { this.$tokenizer = new Tokenizer(new CSharpHighlightRules().getRules()); diff --git a/lib/ace/mode/csharp_highlight_rules.js b/lib/ace/mode/csharp_highlight_rules.js index c119ad1e..4fbe1046 100644 --- a/lib/ace/mode/csharp_highlight_rules.js +++ b/lib/ace/mode/csharp_highlight_rules.js @@ -1,9 +1,9 @@ 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").DocCommentHighlightRules; -var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules; +var oop = require("../lib/oop"); +var lang = require("../lib/lang"); +var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules; +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var CSharpHighlightRules = function() { diff --git a/lib/ace/mode/css.js b/lib/ace/mode/css.js index 2dd1723e..4ba05231 100644 --- a/lib/ace/mode/css.js +++ b/lib/ace/mode/css.js @@ -37,12 +37,12 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var CssHighlightRules = require("ace/mode/css_highlight_rules").CssHighlightRules; -var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent; -var WorkerClient = require("ace/worker/worker_client").WorkerClient; +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules; +var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent; +var WorkerClient = require("../worker/worker_client").WorkerClient; var Mode = 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 114b9af2..7780f44c 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").TextHighlightRules; +var oop = require("../lib/oop"); +var lang = require("../lib/lang"); +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var CssHighlightRules = function() { diff --git a/lib/ace/mode/css_test.js b/lib/ace/mode/css_test.js index b5603ec4..46f2673c 100644 --- a/lib/ace/mode/css_test.js +++ b/lib/ace/mode/css_test.js @@ -36,14 +36,14 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("amd-loader"); } define(function(require, exports, module) { -var EditSession = require("ace/edit_session").EditSession; -var CssMode = require("ace/mode/css").Mode; -var assert = require("ace/test/assertions"); +var EditSession = require("../edit_session").EditSession; +var CssMode = require("./css").Mode; +var assert = require("../test/assertions"); module.exports = { diff --git a/lib/ace/mode/css_tokenizer_test.js b/lib/ace/mode/css_tokenizer_test.js index 469c47e3..c62a6f5d 100644 --- a/lib/ace/mode/css_tokenizer_test.js +++ b/lib/ace/mode/css_tokenizer_test.js @@ -36,13 +36,13 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("amd-loader"); } define(function(require, exports, module) { -var CssMode = require("ace/mode/css").Mode; -var assert = require("ace/test/assertions"); +var CssMode = require("./css").Mode; +var assert = require("../test/assertions"); module.exports = { diff --git a/lib/ace/mode/css_worker.js b/lib/ace/mode/css_worker.js index 354ab31b..c2b62e1b 100644 --- a/lib/ace/mode/css_worker.js +++ b/lib/ace/mode/css_worker.js @@ -37,9 +37,9 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var Mirror = require("ace/worker/mirror").Mirror; -var CSSLint = require("ace/mode/css/csslint").CSSLint; +var oop = require("../lib/oop"); +var Mirror = require("../worker/mirror").Mirror; +var CSSLint = require("./css/csslint").CSSLint; var Worker = exports.Worker = function(sender) { Mirror.call(this, sender); diff --git a/lib/ace/mode/css_worker_test.js b/lib/ace/mode/css_worker_test.js index fb34d3ea..00a886e6 100644 --- a/lib/ace/mode/css_worker_test.js +++ b/lib/ace/mode/css_worker_test.js @@ -36,13 +36,13 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("amd-loader"); } define(function(require, exports, module) { -var assert = require("ace/test/assertions"); -var Worker = require("ace/mode/css_worker").Worker; +var assert = require("../test/assertions"); +var Worker = require("./css_worker").Worker; module.exports = { diff --git a/lib/ace/mode/doc_comment_highlight_rules.js b/lib/ace/mode/doc_comment_highlight_rules.js index 320f58a0..a943e544 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").TextHighlightRules; +var oop = require("../lib/oop"); +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var DocCommentHighlightRules = function() { diff --git a/lib/ace/mode/groovy.js b/lib/ace/mode/groovy.js index 0172c8e7..18f5bb61 100644 --- a/lib/ace/mode/groovy.js +++ b/lib/ace/mode/groovy.js @@ -1,11 +1,11 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var JavaScriptMode = require("ace/mode/javascript").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var GroovyHighlightRules = require("ace/mode/groovy_highlight_rules").GroovyHighlightRules; -var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent; -var CstyleBehaviour = require("ace/mode/behaviour/cstyle").CstyleBehaviour; +var oop = require("../lib/oop"); +var JavaScriptMode = require("./javascript").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var GroovyHighlightRules = require("./groovy_highlight_rules").GroovyHighlightRules; +var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent; +var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour; var Mode = function() { this.$tokenizer = new Tokenizer(new GroovyHighlightRules().getRules()); diff --git a/lib/ace/mode/groovy_highlight_rules.js b/lib/ace/mode/groovy_highlight_rules.js index 5339c4eb..6ed64c7a 100644 --- a/lib/ace/mode/groovy_highlight_rules.js +++ b/lib/ace/mode/groovy_highlight_rules.js @@ -1,9 +1,9 @@ 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").DocCommentHighlightRules; -var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules; +var oop = require("../lib/oop"); +var lang = require("../lib/lang"); +var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules; +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var GroovyHighlightRules = function() { diff --git a/lib/ace/mode/html.js b/lib/ace/mode/html.js index 7d964e8f..4f0c6b85 100644 --- a/lib/ace/mode/html.js +++ b/lib/ace/mode/html.js @@ -37,13 +37,13 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text").Mode; -var JavaScriptMode = require("ace/mode/javascript").Mode; -var CssMode = require("ace/mode/css").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var HtmlHighlightRules = require("ace/mode/html_highlight_rules").HtmlHighlightRules; -var XmlBehaviour = require("ace/mode/behaviour/xml").XmlBehaviour; +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var JavaScriptMode = require("./javascript").Mode; +var CssMode = require("./css").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules; +var XmlBehaviour = require("./behaviour/xml").XmlBehaviour; var Mode = function() { var highlighter = new HtmlHighlightRules(); diff --git a/lib/ace/mode/html_highlight_rules.js b/lib/ace/mode/html_highlight_rules.js index 1cccd1c8..21110a02 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").CssHighlightRules; -var JavaScriptHighlightRules = require("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules; -var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules; +var oop = require("../lib/oop"); +var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules; +var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules; +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var HtmlHighlightRules = function() { diff --git a/lib/ace/mode/html_test.js b/lib/ace/mode/html_test.js index f83934b6..4287b11d 100644 --- a/lib/ace/mode/html_test.js +++ b/lib/ace/mode/html_test.js @@ -36,15 +36,15 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("amd-loader"); } define(function(require, exports, module) { -var EditSession = require("ace/edit_session").EditSession; -var Range = require("ace/range").Range; -var HtmlMode = require("ace/mode/html").Mode; -var assert = require("ace/test/assertions"); +var EditSession = require("../edit_session").EditSession; +var Range = require("../range").Range; +var HtmlMode = require("./html").Mode; +var assert = require("../test/assertions"); module.exports = { setUp : function() { diff --git a/lib/ace/mode/html_tokenizer_test.js b/lib/ace/mode/html_tokenizer_test.js index 9ba6dc4f..a9f77b8b 100644 --- a/lib/ace/mode/html_tokenizer_test.js +++ b/lib/ace/mode/html_tokenizer_test.js @@ -36,13 +36,13 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("amd-loader"); } define(function(require, exports, module) { -var HtmlMode = require("ace/mode/html").Mode; -var assert = require("ace/test/assertions"); +var HtmlMode = require("./html").Mode; +var assert = require("../test/assertions"); module.exports = { setUp : function() { @@ -62,7 +62,7 @@ module.exports = { assert.equal("text", tokens[4].type); assert.equal("string", tokens[5].type); assert.equal("text", tokens[6].type); - assert.equal("keyword", tokens[7].type); + assert.equal("keyword.definition", tokens[7].type); assert.equal("text", tokens[8].type); assert.equal("meta.tag", tokens[9].type); assert.equal("text", tokens[10].type); diff --git a/lib/ace/mode/java.js b/lib/ace/mode/java.js index 9c8c018e..d8f5a241 100644 --- a/lib/ace/mode/java.js +++ b/lib/ace/mode/java.js @@ -1,11 +1,11 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var JavaScriptMode = require("ace/mode/javascript").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var JavaHighlightRules = require("ace/mode/java_highlight_rules").JavaHighlightRules; -var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent; -var CstyleBehaviour = require("ace/mode/behaviour/cstyle").CstyleBehaviour; +var oop = require("../lib/oop"); +var JavaScriptMode = require("./javascript").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var JavaHighlightRules = require("./java_highlight_rules").JavaHighlightRules; +var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent; +var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour; var Mode = function() { this.$tokenizer = new Tokenizer(new JavaHighlightRules().getRules()); diff --git a/lib/ace/mode/java_highlight_rules.js b/lib/ace/mode/java_highlight_rules.js index 46e0ebbd..299ef354 100644 --- a/lib/ace/mode/java_highlight_rules.js +++ b/lib/ace/mode/java_highlight_rules.js @@ -1,9 +1,9 @@ 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").DocCommentHighlightRules; -var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules; +var oop = require("../lib/oop"); +var lang = require("../lib/lang"); +var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules; +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var JavaHighlightRules = function() { diff --git a/lib/ace/mode/javascript.js b/lib/ace/mode/javascript.js index d287ae9f..38553837 100644 --- a/lib/ace/mode/javascript.js +++ b/lib/ace/mode/javascript.js @@ -37,14 +37,14 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var JavaScriptHighlightRules = require("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules; -var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent; -var Range = require("ace/range").Range; -var WorkerClient = require("ace/worker/worker_client").WorkerClient; -var CstyleBehaviour = require("ace/mode/behaviour/cstyle").CstyleBehaviour; +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules; +var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent; +var Range = require("../range").Range; +var WorkerClient = require("../worker/worker_client").WorkerClient; +var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour; var Mode = 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 8081daaa..2ce21425 100644 --- a/lib/ace/mode/javascript_highlight_rules.js +++ b/lib/ace/mode/javascript_highlight_rules.js @@ -38,11 +38,11 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var lang = require("ace/lib/lang"); -var unicode = require("ace/unicode"); -var DocCommentHighlightRules = require("ace/mode/doc_comment_highlight_rules").DocCommentHighlightRules; -var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules; +var oop = require("../lib/oop"); +var lang = require("../lib/lang"); +var unicode = require("../unicode"); +var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules; +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var JavaScriptHighlightRules = function() { diff --git a/lib/ace/mode/javascript_test.js b/lib/ace/mode/javascript_test.js index e2a89be5..b2362e46 100644 --- a/lib/ace/mode/javascript_test.js +++ b/lib/ace/mode/javascript_test.js @@ -36,15 +36,15 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("amd-loader"); } define(function(require, exports, module) { -var EditSession = require("ace/edit_session").EditSession; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var JavaScriptMode = require("ace/mode/javascript").Mode; -var assert = require("ace/test/assertions"); +var EditSession = require("../edit_session").EditSession; +var Tokenizer = require("../tokenizer").Tokenizer; +var JavaScriptMode = require("./javascript").Mode; +var assert = require("../test/assertions"); module.exports = { setUp : function() { diff --git a/lib/ace/mode/javascript_tokenizer_test.js b/lib/ace/mode/javascript_tokenizer_test.js index 856ac3e3..6e907a7b 100644 --- a/lib/ace/mode/javascript_tokenizer_test.js +++ b/lib/ace/mode/javascript_tokenizer_test.js @@ -36,13 +36,13 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("amd-loader"); } define(function(require, exports, module) { -var JavaScriptMode = require("ace/mode/javascript").Mode; -var assert = require("ace/test/assertions"); +var JavaScriptMode = require("./javascript").Mode; +var assert = require("../test/assertions"); module.exports = { @@ -62,7 +62,7 @@ module.exports = { assert.equal("text", tokens[1].type); assert.equal("keyword.operator", tokens[2].type); assert.equal("text", tokens[3].type); - assert.equal("keyword", tokens[4].type); + assert.equal("keyword.definition", tokens[4].type); }, "test: tokenize doc comment" : function() { diff --git a/lib/ace/mode/javascript_worker.js b/lib/ace/mode/javascript_worker.js index 2b5fc7dd..3fb906d0 100644 --- a/lib/ace/mode/javascript_worker.js +++ b/lib/ace/mode/javascript_worker.js @@ -1,9 +1,8 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var Mirror = require("ace/worker/mirror").Mirror; -//var lint = require("ace/worker/jslint").JSLINT; -var lint = require("ace/worker/jshint").JSHINT; +var oop = require("../lib/oop"); +var Mirror = require("../worker/mirror").Mirror; +var lint = require("../worker/jshint").JSHINT; var JavaScriptWorker = exports.JavaScriptWorker = function(sender) { Mirror.call(this, sender); @@ -19,7 +18,7 @@ oop.inherits(JavaScriptWorker, Mirror); value = value.replace(/^#!.*\n/, "\n"); // var start = new Date(); - var parser = require("ace/narcissus/jsparse"); + var parser = require("../narcissus/jsparse"); try { parser.parse(value); } catch(e) { diff --git a/lib/ace/mode/javascript_worker_test.js b/lib/ace/mode/javascript_worker_test.js index d84e0747..c618c410 100644 --- a/lib/ace/mode/javascript_worker_test.js +++ b/lib/ace/mode/javascript_worker_test.js @@ -36,13 +36,13 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("amd-loader"); } define(function(require, exports, module) { -var assert = require("ace/test/assertions"); -var JavaScriptWorker = require("ace/mode/javascript_worker").JavaScriptWorker; +var assert = require("../test/assertions"); +var JavaScriptWorker = require("./javascript_worker").JavaScriptWorker; module.exports = { diff --git a/lib/ace/mode/json.js b/lib/ace/mode/json.js index 885a3f3d..e908d53c 100644 --- a/lib/ace/mode/json.js +++ b/lib/ace/mode/json.js @@ -37,13 +37,13 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var HighlightRules = require("ace/mode/json_highlight_rules").JsonHighlightRules; -var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent; -var Range = require("ace/range").Range; -var CstyleBehaviour = require("ace/mode/behaviour/cstyle").CstyleBehaviour; +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var HighlightRules = require("./json_highlight_rules").JsonHighlightRules; +var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent; +var Range = require("../range").Range; +var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour; var Mode = function() { this.$tokenizer = new Tokenizer(new HighlightRules().getRules()); diff --git a/lib/ace/mode/json_highlight_rules.js b/lib/ace/mode/json_highlight_rules.js index a1e3038d..9ea0e9e3 100644 --- a/lib/ace/mode/json_highlight_rules.js +++ b/lib/ace/mode/json_highlight_rules.js @@ -38,9 +38,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").TextHighlightRules; +var oop = require("../lib/oop"); +var lang = require("../lib/lang"); +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var JsonHighlightRules = function() { diff --git a/lib/ace/mode/latex.js b/lib/ace/mode/latex.js index 9ab63f5a..fba7de34 100644 --- a/lib/ace/mode/latex.js +++ b/lib/ace/mode/latex.js @@ -1,10 +1,10 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var LatexHighlightRules = require("ace/mode/latex_highlight_rules").LatexHighlightRules; -var Range = require("ace/range").Range; +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var LatexHighlightRules = require("./latex_highlight_rules").LatexHighlightRules; +var Range = require("../range").Range; var Mode = function() { diff --git a/lib/ace/mode/latex_highlight_rules.js b/lib/ace/mode/latex_highlight_rules.js index 06c1e67e..2b15cdbf 100644 --- a/lib/ace/mode/latex_highlight_rules.js +++ b/lib/ace/mode/latex_highlight_rules.js @@ -1,7 +1,7 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules; +var oop = require("../lib/oop"); +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var LatexHighlightRules = function() { diff --git a/lib/ace/mode/lua.js b/lib/ace/mode/lua.js index ace68a36..4df20dcb 100644 --- a/lib/ace/mode/lua.js +++ b/lib/ace/mode/lua.js @@ -38,11 +38,11 @@ * ***** END LICENSE BLOCK ***** */ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var LuaHighlightRules = require("ace/mode/lua_highlight_rules").LuaHighlightRules; -var Range = require("ace/range").Range; +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var LuaHighlightRules = require("./lua_highlight_rules").LuaHighlightRules; +var Range = require("../range").Range; var Mode = function() { this.$tokenizer = new Tokenizer(new LuaHighlightRules().getRules()); diff --git a/lib/ace/mode/lua_highlight_rules.js b/lib/ace/mode/lua_highlight_rules.js index 4874e404..38939542 100644 --- a/lib/ace/mode/lua_highlight_rules.js +++ b/lib/ace/mode/lua_highlight_rules.js @@ -39,9 +39,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").TextHighlightRules; +var oop = require("../lib/oop"); +var lang = require("../lib/lang"); +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var LuaHighlightRules = function() { diff --git a/lib/ace/mode/markdown.js b/lib/ace/mode/markdown.js index 0fed5b92..eb85f0b3 100644 --- a/lib/ace/mode/markdown.js +++ b/lib/ace/mode/markdown.js @@ -40,14 +40,14 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text").Mode; -var JavaScriptMode = require("ace/mode/javascript").Mode; -var XmlMode = require("ace/mode/xml").Mode; -var HtmlMode = require("ace/mode/html").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var MarkdownHighlightRules = require("ace/mode/markdown_highlight_rules").MarkdownHighlightRules; -var Range = require("ace/range").Range; +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var JavaScriptMode = require("./javascript").Mode; +var XmlMode = require("./xml").Mode; +var HtmlMode = require("./html").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var MarkdownHighlightRules = require("./markdown_highlight_rules").MarkdownHighlightRules; +var Range = require("../range").Range; var Mode = function() { var highlighter = new MarkdownHighlightRules(); diff --git a/lib/ace/mode/markdown_highlight_rules.js b/lib/ace/mode/markdown_highlight_rules.js index 5dbbe2d6..61b8eccf 100644 --- a/lib/ace/mode/markdown_highlight_rules.js +++ b/lib/ace/mode/markdown_highlight_rules.js @@ -38,12 +38,12 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules; -var JavaScriptHighlightRules = require("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules; -var XmlHighlightRules = require("ace/mode/xml_highlight_rules").XmlHighlightRules; -var HtmlHighlightRules = require("ace/mode/html_highlight_rules").HtmlHighlightRules; -var CssHighlightRules = require("ace/mode/css_highlight_rules").CssHighlightRules; +var oop = require("../lib/oop"); +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; +var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules; +var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules; +var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules; +var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules; function github_embed(tag, prefix) { return { // Github style block diff --git a/lib/ace/mode/matching_brace_outdent.js b/lib/ace/mode/matching_brace_outdent.js index 3ca68c04..2c713c15 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").Range; +var Range = require("../range").Range; var MatchingBraceOutdent = function() {}; diff --git a/lib/ace/mode/matching_parens_outdent.js b/lib/ace/mode/matching_parens_outdent.js index 1e27f85b..69891356 100644 --- a/lib/ace/mode/matching_parens_outdent.js +++ b/lib/ace/mode/matching_parens_outdent.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var Range = require("ace/range").Range; +var Range = require("../range").Range; var MatchingParensOutdent = function() {}; diff --git a/lib/ace/mode/ocaml.js b/lib/ace/mode/ocaml.js index d226ed9d..2ade8f53 100644 --- a/lib/ace/mode/ocaml.js +++ b/lib/ace/mode/ocaml.js @@ -37,12 +37,12 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var OcamlHighlightRules = require("ace/mode/ocaml_highlight_rules").OcamlHighlightRules; -var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent; -var Range = require("ace/range").Range; +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var OcamlHighlightRules = require("./ocaml_highlight_rules").OcamlHighlightRules; +var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent; +var Range = require("../range").Range; var Mode = function() { this.$tokenizer = new Tokenizer(new OcamlHighlightRules().getRules()); diff --git a/lib/ace/mode/ocaml_highlight_rules.js b/lib/ace/mode/ocaml_highlight_rules.js index 595b0d9d..c9261fb6 100644 --- a/lib/ace/mode/ocaml_highlight_rules.js +++ b/lib/ace/mode/ocaml_highlight_rules.js @@ -39,9 +39,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").TextHighlightRules; +var oop = require("../lib/oop"); +var lang = require("../lib/lang"); +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var OcamlHighlightRules = function() { diff --git a/lib/ace/mode/perl.js b/lib/ace/mode/perl.js index 7174e995..0ce562b5 100644 --- a/lib/ace/mode/perl.js +++ b/lib/ace/mode/perl.js @@ -37,12 +37,12 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var PerlHighlightRules = require("ace/mode/perl_highlight_rules").PerlHighlightRules; -var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent; -var Range = require("ace/range").Range; +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var PerlHighlightRules = require("./perl_highlight_rules").PerlHighlightRules; +var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent; +var Range = require("../range").Range; var Mode = function() { this.$tokenizer = new Tokenizer(new PerlHighlightRules().getRules()); diff --git a/lib/ace/mode/perl_highlight_rules.js b/lib/ace/mode/perl_highlight_rules.js index a1365c18..40e8b963 100644 --- a/lib/ace/mode/perl_highlight_rules.js +++ b/lib/ace/mode/perl_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").TextHighlightRules; +var oop = require("../lib/oop"); +var lang = require("../lib/lang"); +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var PerlHighlightRules = function() { diff --git a/lib/ace/mode/php.js b/lib/ace/mode/php.js index 869c709b..1dc23e0f 100644 --- a/lib/ace/mode/php.js +++ b/lib/ace/mode/php.js @@ -37,13 +37,13 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var PhpHighlightRules = require("ace/mode/php_highlight_rules").PhpHighlightRules; -var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent; -var Range = require("ace/range").Range; -var CstyleBehaviour = require("ace/mode/behaviour/cstyle").CstyleBehaviour; +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var PhpHighlightRules = require("./php_highlight_rules").PhpHighlightRules; +var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent; +var Range = require("../range").Range; +var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour; var Mode = function() { this.$tokenizer = new Tokenizer(new PhpHighlightRules().getRules()); diff --git a/lib/ace/mode/php_highlight_rules.js b/lib/ace/mode/php_highlight_rules.js index e6e64ee6..a873f6fc 100644 --- a/lib/ace/mode/php_highlight_rules.js +++ b/lib/ace/mode/php_highlight_rules.js @@ -38,10 +38,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").DocCommentHighlightRules; -var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules; +var oop = require("../lib/oop"); +var lang = require("../lib/lang"); +var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules; +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var PhpHighlightRules = function() { // http://php.net/quickref.php diff --git a/lib/ace/mode/powershell.js b/lib/ace/mode/powershell.js index 401fb66b..1b9e362e 100644 --- a/lib/ace/mode/powershell.js +++ b/lib/ace/mode/powershell.js @@ -1,11 +1,11 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var PowershellHighlightRules = require("ace/mode/powershell_highlight_rules").PowershellHighlightRules; -var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent; -var CstyleBehaviour = require("ace/mode/behaviour/cstyle").CstyleBehaviour; +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var PowershellHighlightRules = require("./powershell_highlight_rules").PowershellHighlightRules; +var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent; +var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour; var Mode = function() { this.$tokenizer = new Tokenizer(new PowershellHighlightRules().getRules()); @@ -16,34 +16,34 @@ oop.inherits(Mode, TextMode); (function() { - this.getNextLineIndent = function(state, line, tab) { - var indent = this.$getIndent(line); + this.getNextLineIndent = function(state, line, tab) { + var indent = this.$getIndent(line); - var tokenizedLine = this.$tokenizer.getLineTokens(line, state); - var tokens = tokenizedLine.tokens; - var endState = tokenizedLine.state; + var tokenizedLine = this.$tokenizer.getLineTokens(line, state); + var tokens = tokenizedLine.tokens; + var endState = tokenizedLine.state; - if (tokens.length && tokens[tokens.length-1].type == "comment") { - return indent; - } + if (tokens.length && tokens[tokens.length-1].type == "comment") { + return indent; + } - if (state == "start") { - var match = line.match(/^.*[\{\(\[]\s*$/); - if (match) { - indent += tab; - } - } + if (state == "start") { + var match = line.match(/^.*[\{\(\[]\s*$/); + if (match) { + indent += tab; + } + } - return indent; - }; + return indent; + }; - this.checkOutdent = function(state, line, input) { - return this.$outdent.checkOutdent(line, input); - }; + this.checkOutdent = function(state, line, input) { + return this.$outdent.checkOutdent(line, input); + }; - this.autoOutdent = function(state, doc, row) { - this.$outdent.autoOutdent(doc, row); - }; + this.autoOutdent = function(state, doc, row) { + this.$outdent.autoOutdent(doc, row); + }; this.createWorker = function(session) { diff --git a/lib/ace/mode/powershell_highlight_rules.js b/lib/ace/mode/powershell_highlight_rules.js index 9cf9243f..2cdf64e2 100644 --- a/lib/ace/mode/powershell_highlight_rules.js +++ b/lib/ace/mode/powershell_highlight_rules.js @@ -1,9 +1,9 @@ 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").DocCommentHighlightRules; -var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules; +var oop = require("../lib/oop"); +var lang = require("../lib/lang"); +var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules; +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var PowershellHighlightRules = function() { diff --git a/lib/ace/mode/python.js b/lib/ace/mode/python.js index 6b1dda73..5d95012c 100644 --- a/lib/ace/mode/python.js +++ b/lib/ace/mode/python.js @@ -38,12 +38,12 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var PythonHighlightRules = require("ace/mode/python_highlight_rules").PythonHighlightRules; -var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent; -var Range = require("ace/range").Range; +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var PythonHighlightRules = require("./python_highlight_rules").PythonHighlightRules; +var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent; +var Range = require("../range").Range; var Mode = function() { this.$tokenizer = new Tokenizer(new PythonHighlightRules().getRules()); diff --git a/lib/ace/mode/python_highlight_rules.js b/lib/ace/mode/python_highlight_rules.js index e369e2bd..e28c5835 100644 --- a/lib/ace/mode/python_highlight_rules.js +++ b/lib/ace/mode/python_highlight_rules.js @@ -41,9 +41,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").TextHighlightRules; +var oop = require("../lib/oop"); +var lang = require("../lib/lang"); +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var PythonHighlightRules = function() { diff --git a/lib/ace/mode/python_test.js b/lib/ace/mode/python_test.js index 8980afca..156dc1d0 100644 --- a/lib/ace/mode/python_test.js +++ b/lib/ace/mode/python_test.js @@ -36,15 +36,15 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("amd-loader"); } define(function(require, exports, module) { -var EditSession = require("ace/edit_session").EditSession; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var Mode = require("ace/mode/python").Mode; -var assert = require("ace/test/assertions"); +var EditSession = require("../edit_session").EditSession; +var Tokenizer = require("../tokenizer").Tokenizer; +var Mode = require("./python").Mode; +var assert = require("../test/assertions"); module.exports = { setUp : function() { diff --git a/lib/ace/mode/ruby.js b/lib/ace/mode/ruby.js index b223c997..b8a585d7 100644 --- a/lib/ace/mode/ruby.js +++ b/lib/ace/mode/ruby.js @@ -38,12 +38,12 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var RubyHighlightRules = require("ace/mode/ruby_highlight_rules").RubyHighlightRules; -var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent; -var Range = require("ace/range").Range; +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var RubyHighlightRules = require("./ruby_highlight_rules").RubyHighlightRules; +var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent; +var Range = require("../range").Range; var Mode = function() { this.$tokenizer = new Tokenizer(new RubyHighlightRules().getRules()); diff --git a/lib/ace/mode/ruby_highlight_rules.js b/lib/ace/mode/ruby_highlight_rules.js index ea01b506..2cfd320a 100644 --- a/lib/ace/mode/ruby_highlight_rules.js +++ b/lib/ace/mode/ruby_highlight_rules.js @@ -38,9 +38,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").TextHighlightRules; +var oop = require("../lib/oop"); +var lang = require("../lib/lang"); +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var RubyHighlightRules = function() { diff --git a/lib/ace/mode/ruby_tokenizer_test.js b/lib/ace/mode/ruby_tokenizer_test.js index b4aed103..887a260f 100644 --- a/lib/ace/mode/ruby_tokenizer_test.js +++ b/lib/ace/mode/ruby_tokenizer_test.js @@ -37,13 +37,13 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("amd-loader"); } define(function(require, exports, module) { -var RubyMode = require("ace/mode/ruby").Mode; -var assert = require("ace/test/assertions"); +var RubyMode = require("./ruby").Mode; +var assert = require("../test/assertions"); module.exports = { diff --git a/lib/ace/mode/scad.js b/lib/ace/mode/scad.js index 004e471f..cc9ade93 100644 --- a/lib/ace/mode/scad.js +++ b/lib/ace/mode/scad.js @@ -38,13 +38,13 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var scadHighlightRules = require("ace/mode/scad_highlight_rules").scadHighlightRules; -var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent; -var Range = require("ace/range").Range; -var CstyleBehaviour = require("ace/mode/behaviour/cstyle").CstyleBehaviour; +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var scadHighlightRules = require("./scad_highlight_rules").scadHighlightRules; +var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent; +var Range = require("../range").Range; +var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour; var Mode = function() { this.$tokenizer = new Tokenizer(new scadHighlightRules().getRules()); diff --git a/lib/ace/mode/scad_highlight_rules.js b/lib/ace/mode/scad_highlight_rules.js index 118a7ca5..fe619ae8 100644 --- a/lib/ace/mode/scad_highlight_rules.js +++ b/lib/ace/mode/scad_highlight_rules.js @@ -40,10 +40,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").DocCommentHighlightRules; -var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules; +var oop = require("../lib/oop"); +var lang = require("../lib/lang"); +var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules; +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var scadHighlightRules = function() { diff --git a/lib/ace/mode/scala.js b/lib/ace/mode/scala.js index b71f9790..58448099 100644 --- a/lib/ace/mode/scala.js +++ b/lib/ace/mode/scala.js @@ -1,11 +1,11 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var JavaScriptMode = require("ace/mode/javascript").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var ScalaHighlightRules = require("ace/mode/scala_highlight_rules").ScalaHighlightRules; -var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent; -var CstyleBehaviour = require("ace/mode/behaviour/cstyle").CstyleBehaviour; +var oop = require("../lib/oop"); +var JavaScriptMode = require("./javascript").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var ScalaHighlightRules = require("./scala_highlight_rules").ScalaHighlightRules; +var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent; +var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour; var Mode = function() { this.$tokenizer = new Tokenizer(new ScalaHighlightRules().getRules()); diff --git a/lib/ace/mode/scala_highlight_rules.js b/lib/ace/mode/scala_highlight_rules.js index 20deca2c..358a5a55 100644 --- a/lib/ace/mode/scala_highlight_rules.js +++ b/lib/ace/mode/scala_highlight_rules.js @@ -1,9 +1,9 @@ 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").DocCommentHighlightRules; -var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules; +var oop = require("../lib/oop"); +var lang = require("../lib/lang"); +var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules; +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var ScalaHighlightRules = function() { diff --git a/lib/ace/mode/scss.js b/lib/ace/mode/scss.js index 8810590e..88c7db49 100644 --- a/lib/ace/mode/scss.js +++ b/lib/ace/mode/scss.js @@ -37,11 +37,11 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var ScssHighlightRules = require("ace/mode/scss_highlight_rules").ScssHighlightRules; -var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent; +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var ScssHighlightRules = require("./scss_highlight_rules").ScssHighlightRules; +var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent; var Mode = function() { this.$tokenizer = new Tokenizer(new ScssHighlightRules().getRules()); diff --git a/lib/ace/mode/scss_highlight_rules.js b/lib/ace/mode/scss_highlight_rules.js index fa963447..860b8467 100644 --- a/lib/ace/mode/scss_highlight_rules.js +++ b/lib/ace/mode/scss_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").TextHighlightRules; +var oop = require("../lib/oop"); +var lang = require("../lib/lang"); +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var ScssHighlightRules = function() { diff --git a/lib/ace/mode/sql.js b/lib/ace/mode/sql.js index 1a79d300..30026b48 100644 --- a/lib/ace/mode/sql.js +++ b/lib/ace/mode/sql.js @@ -20,49 +20,50 @@ define(function(require, exports, module) { - var oop = require("ace/lib/oop"); - var TextMode = require("ace/mode/text").Mode; - var Tokenizer = require("ace/tokenizer").Tokenizer; - var SqlHighlightRules = require("ace/mode/sql_highlight_rules").SqlHighlightRules; - var Range = require("ace/range").Range; +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var SqlHighlightRules = require("./sql_highlight_rules").SqlHighlightRules; +var Range = require("../range").Range; - var Mode = function() { - this.$tokenizer = new Tokenizer(new SqlHighlightRules().getRules()); +var Mode = function() { + this.$tokenizer = new Tokenizer(new SqlHighlightRules().getRules()); +}; +oop.inherits(Mode, TextMode); + +(function() { + + this.toggleCommentLines = function(state, doc, startRow, endRow) { + var outdent = true; + var outentedRows = []; + var re = /^(\s*)--/; + + for (var i=startRow; i<= endRow; i++) { + if (!re.test(doc.getLine(i))) { + outdent = false; + break; + } + } + + if (outdent) { + var deleteRange = new Range(0, 0, 0, 0); + for (var i=startRow; i<= endRow; i++) + { + var line = doc.getLine(i); + var m = line.match(re); + deleteRange.start.row = i; + deleteRange.end.row = i; + deleteRange.end.column = m[0].length; + doc.replace(deleteRange, m[1]); + } + } + else { + doc.indentRows(startRow, endRow, "--"); + } }; - oop.inherits(Mode, TextMode); - (function() { +}).call(Mode.prototype); - this.toggleCommentLines = function(state, doc, startRow, endRow) { - var outdent = true; - var outentedRows = []; - var re = /^(\s*)--/; +exports.Mode = Mode; - for (var i=startRow; i<= endRow; i++) { - if (!re.test(doc.getLine(i))) { - outdent = false; - break; - } - } - - if (outdent) { - var deleteRange = new Range(0, 0, 0, 0); - for (var i=startRow; i<= endRow; i++) - { - var line = doc.getLine(i); - var m = line.match(re); - deleteRange.start.row = i; - deleteRange.end.row = i; - deleteRange.end.column = m[0].length; - doc.replace(deleteRange, m[1]); - } - } - else { - doc.indentRows(startRow, endRow, "--"); - } - }; - - }).call(Mode.prototype); - - exports.Mode = Mode; }); diff --git a/lib/ace/mode/sql_highlight_rules.js b/lib/ace/mode/sql_highlight_rules.js index 4ed1059a..6cd36e75 100644 --- a/lib/ace/mode/sql_highlight_rules.js +++ b/lib/ace/mode/sql_highlight_rules.js @@ -22,9 +22,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").TextHighlightRules; +var oop = require("../lib/oop"); +var lang = require("../lib/lang"); +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var SqlHighlightRules = function() { diff --git a/lib/ace/mode/svg.js b/lib/ace/mode/svg.js index 64549f0d..37b9c1f9 100644 --- a/lib/ace/mode/svg.js +++ b/lib/ace/mode/svg.js @@ -37,12 +37,12 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var XmlMode = require("ace/mode/text").Mode; -var JavaScriptMode = require("ace/mode/javascript").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var SvgHighlightRules = require("ace/mode/svg_highlight_rules").SvgHighlightRules; -var XmlBehaviour = require("ace/mode/behaviour/xml").XmlBehaviour; +var oop = require("../lib/oop"); +var XmlMode = require("./text").Mode; +var JavaScriptMode = require("./javascript").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var SvgHighlightRules = require("./svg_highlight_rules").SvgHighlightRules; +var XmlBehaviour = require("./behaviour/xml").XmlBehaviour; var Mode = function() { this.highlighter = new SvgHighlightRules(); diff --git a/lib/ace/mode/svg_highlight_rules.js b/lib/ace/mode/svg_highlight_rules.js index 9d9d79c2..90f05a7f 100644 --- a/lib/ace/mode/svg_highlight_rules.js +++ b/lib/ace/mode/svg_highlight_rules.js @@ -37,9 +37,9 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var JavaScriptHighlightRules = require("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules; -var XmlHighlightRules = require("ace/mode/xml_highlight_rules").XmlHighlightRules; +var oop = require("../lib/oop"); +var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules; +var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules; var SvgHighlightRules = function() { XmlHighlightRules.call(this); diff --git a/lib/ace/mode/text.js b/lib/ace/mode/text.js index 7f541d3e..71d34822 100644 --- a/lib/ace/mode/text.js +++ b/lib/ace/mode/text.js @@ -40,10 +40,10 @@ define(function(require, exports, module) { -var Tokenizer = require("ace/tokenizer").Tokenizer; -var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules; -var Behaviour = require("ace/mode/behaviour").Behaviour; -var unicode = require("ace/unicode"); +var Tokenizer = require("../tokenizer").Tokenizer; +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; +var Behaviour = require("./behaviour").Behaviour; +var unicode = require("../unicode"); var Mode = function() { this.$tokenizer = new Tokenizer(new TextHighlightRules().getRules()); diff --git a/lib/ace/mode/text_highlight_rules.js b/lib/ace/mode/text_highlight_rules.js index 639bcb3b..55a9e98c 100644 --- a/lib/ace/mode/text_highlight_rules.js +++ b/lib/ace/mode/text_highlight_rules.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var lang = require("ace/lib/lang"); +var lang = require("../lib/lang"); var TextHighlightRules = function() { diff --git a/lib/ace/mode/text_test.js b/lib/ace/mode/text_test.js index 17d73f35..7aa9de95 100644 --- a/lib/ace/mode/text_test.js +++ b/lib/ace/mode/text_test.js @@ -36,14 +36,14 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("amd-loader"); } define(function(require, exports, module) { -var EditSession = require("ace/edit_session").EditSession; -var TextMode = require("ace/mode/text").Mode; -var assert = require("ace/test/assertions"); +var EditSession = require("../edit_session").EditSession; +var TextMode = require("./text").Mode; +var assert = require("../test/assertions"); module.exports = { setUp : function() { diff --git a/lib/ace/mode/textile.js b/lib/ace/mode/textile.js index 92473587..970f5bbd 100644 --- a/lib/ace/mode/textile.js +++ b/lib/ace/mode/textile.js @@ -37,12 +37,12 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var TextileHighlightRules = require("ace/mode/textile_highlight_rules").TextileHighlightRules; -var MatchingBraceOutdent = require("ace/mode/matching_brace_outdent").MatchingBraceOutdent; -var Range = require("ace/range").Range; +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var TextileHighlightRules = require("./textile_highlight_rules").TextileHighlightRules; +var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent; +var Range = require("../range").Range; var Mode = function() { diff --git a/lib/ace/mode/textile_highlight_rules.js b/lib/ace/mode/textile_highlight_rules.js index 30eb094e..e4cf215a 100644 --- a/lib/ace/mode/textile_highlight_rules.js +++ b/lib/ace/mode/textile_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").TextHighlightRules; +var oop = require("../lib/oop"); +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var TextileHighlightRules = function() { this.$rules = { diff --git a/lib/ace/mode/xml.js b/lib/ace/mode/xml.js index 68d1af33..ad0bc656 100644 --- a/lib/ace/mode/xml.js +++ b/lib/ace/mode/xml.js @@ -37,11 +37,11 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var TextMode = require("ace/mode/text").Mode; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var XmlHighlightRules = require("ace/mode/xml_highlight_rules").XmlHighlightRules; -var XmlBehaviour = require("ace/mode/behaviour/xml").XmlBehaviour; +var oop = require("../lib/oop"); +var TextMode = require("./text").Mode; +var Tokenizer = require("../tokenizer").Tokenizer; +var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules; +var XmlBehaviour = require("./behaviour/xml").XmlBehaviour; var Mode = 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 649a2f46..d4afe163 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").TextHighlightRules; +var oop = require("../lib/oop"); +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; var XmlHighlightRules = function() { diff --git a/lib/ace/mode/xml_test.js b/lib/ace/mode/xml_test.js index bd1d161c..b68c37f5 100644 --- a/lib/ace/mode/xml_test.js +++ b/lib/ace/mode/xml_test.js @@ -36,15 +36,15 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("amd-loader"); } define(function(require, exports, module) { -var EditSession = require("ace/edit_session").EditSession; -var Tokenizer = require("ace/tokenizer").Tokenizer; -var XmlMode = require("ace/mode/xml").Mode; -var assert = require("ace/test/assertions"); +var EditSession = require("../edit_session").EditSession; +var Tokenizer = require("../tokenizer").Tokenizer; +var XmlMode = require("./xml").Mode; +var assert = require("../test/assertions"); module.exports = { setUp : function() { diff --git a/lib/ace/mode/xml_tokenizer_test.js b/lib/ace/mode/xml_tokenizer_test.js index ef384360..ed5980e0 100644 --- a/lib/ace/mode/xml_tokenizer_test.js +++ b/lib/ace/mode/xml_tokenizer_test.js @@ -36,13 +36,13 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("amd-loader"); } define(function(require, exports, module) { -var XmlMode = require("ace/mode/xml").Mode; -var assert = require("ace/test/assertions"); +var XmlMode = require("./xml").Mode; +var assert = require("../test/assertions"); module.exports = { diff --git a/lib/ace/mouse/default_handlers.js b/lib/ace/mouse/default_handlers.js index 5b3ce9d3..a574e46a 100644 --- a/lib/ace/mouse/default_handlers.js +++ b/lib/ace/mouse/default_handlers.js @@ -39,10 +39,10 @@ define(function(require, exports, module) { -var event = require("ace/lib/event"); -var dom = require("ace/lib/dom"); -var EventEmitter = require("ace/lib/event_emitter").EventEmitter; -var BrowserFocus = require("ace/lib/browser_focus").BrowserFocus; +var event = require("../lib/event"); +var dom = require("../lib/dom"); +var EventEmitter = require("../lib/event_emitter").EventEmitter; +var BrowserFocus = require("../lib/browser_focus").BrowserFocus; var STATE_UNKNOWN = 0; var STATE_SELECT = 1; diff --git a/lib/ace/mouse/mouse_event.js b/lib/ace/mouse/mouse_event.js index 1358f782..b8ffcf5c 100644 --- a/lib/ace/mouse/mouse_event.js +++ b/lib/ace/mouse/mouse_event.js @@ -38,8 +38,8 @@ define(function(require, exports, module) { -var event = require("ace/lib/event"); -var dom = require("ace/lib/dom"); +var event = require("../lib/event"); +var dom = require("../lib/dom"); /** * Custom Ace mouse event diff --git a/lib/ace/mouse/mouse_handler.js b/lib/ace/mouse/mouse_handler.js index 6426d541..18ad462a 100644 --- a/lib/ace/mouse/mouse_handler.js +++ b/lib/ace/mouse/mouse_handler.js @@ -39,9 +39,9 @@ define(function(require, exports, module) { -var event = require("ace/lib/event"); -var DefaultHandlers = require("ace/mouse/default_handlers").DefaultHandlers; -var MouseEvent = require("ace/mouse/mouse_event").MouseEvent; +var event = require("../lib/event"); +var DefaultHandlers = require("./default_handlers").DefaultHandlers; +var MouseEvent = require("./mouse_event").MouseEvent; var MouseHandler = function(editor) { this.editor = editor; diff --git a/lib/ace/narcissus/jslex.js b/lib/ace/narcissus/jslex.js index b65cf334..ce561f55 100644 --- a/lib/ace/narcissus/jslex.js +++ b/lib/ace/narcissus/jslex.js @@ -49,7 +49,7 @@ define(function(require, exports, module) { - var definitions = require("ace/narcissus/jsdefs"); + var definitions = require("./jsdefs"); // Set constants in the local scope. eval(definitions.consts); diff --git a/lib/ace/narcissus/jsparse.js b/lib/ace/narcissus/jsparse.js index 3855b182..c431f191 100644 --- a/lib/ace/narcissus/jsparse.js +++ b/lib/ace/narcissus/jsparse.js @@ -51,8 +51,8 @@ define(function(require, exports, module) { - var lexer = require("ace/narcissus/jslex"); - var definitions = require("ace/narcissus/jsdefs"); + var lexer = require("./jslex"); + var definitions = require("./jsdefs"); const StringMap = definitions.StringMap; const Stack = definitions.Stack; diff --git a/lib/ace/range_test.js b/lib/ace/range_test.js index 68404378..01924a5a 100644 --- a/lib/ace/range_test.js +++ b/lib/ace/range_test.js @@ -36,14 +36,14 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../support/paths"); + require("amd-loader"); } define(function(require, exports, module) { -var Range = require("ace/range").Range; -var EditSession = require("ace/edit_session").EditSession; -var assert = require("ace/test/assertions"); +var Range = require("./range").Range; +var EditSession = require("./edit_session").EditSession; +var assert = require("./test/assertions"); module.exports = { diff --git a/lib/ace/renderloop.js b/lib/ace/renderloop.js index 1a30c1b2..de3cd496 100644 --- a/lib/ace/renderloop.js +++ b/lib/ace/renderloop.js @@ -38,7 +38,7 @@ define(function(require, exports, module) { -var event = require("ace/lib/event"); +var event = require("./lib/event"); var RenderLoop = function(onRender, window) { this.onRender = onRender; diff --git a/lib/ace/scrollbar.js b/lib/ace/scrollbar.js index bd5b3438..64c418df 100644 --- a/lib/ace/scrollbar.js +++ b/lib/ace/scrollbar.js @@ -38,10 +38,10 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var dom = require("ace/lib/dom"); -var event = require("ace/lib/event"); -var EventEmitter = require("ace/lib/event_emitter").EventEmitter; +var oop = require("./lib/oop"); +var dom = require("./lib/dom"); +var event = require("./lib/event"); +var EventEmitter = require("./lib/event_emitter").EventEmitter; var ScrollBar = function(parent) { this.element = dom.createElement("div"); diff --git a/lib/ace/search.js b/lib/ace/search.js index 0c8899c3..f7651ee6 100644 --- a/lib/ace/search.js +++ b/lib/ace/search.js @@ -39,9 +39,9 @@ define(function(require, exports, module) { -var lang = require("ace/lib/lang"); -var oop = require("ace/lib/oop"); -var Range = require("ace/range").Range; +var lang = require("./lib/lang"); +var oop = require("./lib/oop"); +var Range = require("./range").Range; var Search = function() { this.$options = { diff --git a/lib/ace/search_test.js b/lib/ace/search_test.js index 284a9c69..62007f96 100644 --- a/lib/ace/search_test.js +++ b/lib/ace/search_test.js @@ -37,14 +37,14 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../support/paths"); + require("amd-loader"); } define(function(require, exports, module) { -var EditSession = require("ace/edit_session").EditSession; -var Search = require("ace/search").Search; -var assert = require("ace/test/assertions"); +var EditSession = require("./edit_session").EditSession; +var Search = require("./search").Search; +var assert = require("./test/assertions"); module.exports = { "test: configure the search object" : function() { diff --git a/lib/ace/selection.js b/lib/ace/selection.js index 0288fa24..88a7bd64 100644 --- a/lib/ace/selection.js +++ b/lib/ace/selection.js @@ -38,10 +38,10 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var lang = require("ace/lib/lang"); -var EventEmitter = require("ace/lib/event_emitter").EventEmitter; -var Range = require("ace/range").Range; +var oop = require("./lib/oop"); +var lang = require("./lib/lang"); +var EventEmitter = require("./lib/event_emitter").EventEmitter; +var Range = require("./range").Range; /** * Keeps cursor position and the text selection of an edit session. diff --git a/lib/ace/selection_test.js b/lib/ace/selection_test.js index 95914b77..fc962a18 100644 --- a/lib/ace/selection_test.js +++ b/lib/ace/selection_test.js @@ -36,13 +36,13 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../support/paths"); + require("amd-loader"); } define(function(require, exports, module) { -var EditSession = require("ace/edit_session").EditSession; -var assert = require("ace/test/assertions"); +var EditSession = require("./edit_session").EditSession; +var assert = require("./test/assertions"); module.exports = { createSession : function(rows, cols) { @@ -445,18 +445,6 @@ module.exports = { assert.position(selection.getCursor(), 1, 4); }, - "test (keyboard navigation) when curLine is EOL and targetLine is all whitespace new column should be targetLine's EOL": function() { - var session = new EditSession("function (a) {\n\ - \n\ -}"); - var selection = session.getSelection(); - - selection.moveCursorTo(2, 1); - selection.moveCursorUp(); - - assert.position(selection.getCursor(), 1, 4); - }, - "test (keyboard navigation) when curLine is not EOL and targetLine is all whitespace new column should be current column": function() { var session = new EditSession("function (a) {\n\ \n\ diff --git a/lib/ace/split.js b/lib/ace/split.js index 0228fb7d..06f05b6b 100644 --- a/lib/ace/split.js +++ b/lib/ace/split.js @@ -38,14 +38,14 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var dom = require("ace/lib/dom"); -var lang = require("ace/lib/lang"); -var EventEmitter = require("ace/lib/event_emitter").EventEmitter; +var oop = require("./lib/oop"); +var dom = require("./lib/dom"); +var lang = require("./lib/lang"); +var EventEmitter = require("./lib/event_emitter").EventEmitter; -var Editor = require("ace/editor").Editor; -var Renderer = require("ace/virtual_renderer").VirtualRenderer; -var EditSession = require("ace/edit_session").EditSession; +var Editor = require("./editor").Editor; +var Renderer = require("./virtual_renderer").VirtualRenderer; +var EditSession = require("./edit_session").EditSession; var Split = function(container, theme, splits) { this.BELOW = 1; diff --git a/lib/ace/test/all.js b/lib/ace/test/all.js index f3a74725..7c0b1edd 100644 --- a/lib/ace/test/all.js +++ b/lib/ace/test/all.js @@ -35,7 +35,5 @@ * * ***** END LICENSE BLOCK ***** */ -require("../../../support/paths"); - var test = require("asyncjs").test; test.walkTestCases(__dirname + "/..").exec(); \ No newline at end of file diff --git a/lib/ace/test/benchmark.js b/lib/ace/test/benchmark.js index 36241f60..7861bef6 100644 --- a/lib/ace/test/benchmark.js +++ b/lib/ace/test/benchmark.js @@ -36,13 +36,13 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("amd-loader"); } define(function(require, exports, module) { -var assert = require("ace/test/assertions"); -var EditSession = require("ace/edit_session").EditSession; +var assert = require("../test/assertions"); +var EditSession = require("../edit_session").EditSession; module.exports = { setUp : function() { diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js index b498711e..7b39f927 100644 --- a/lib/ace/virtual_renderer.js +++ b/lib/ace/virtual_renderer.js @@ -40,18 +40,18 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var dom = require("ace/lib/dom"); -var event = require("ace/lib/event"); -var useragent = require("ace/lib/useragent"); -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").ScrollBar; -var RenderLoop = require("ace/renderloop").RenderLoop; -var EventEmitter = require("ace/lib/event_emitter").EventEmitter; -var editorCss = require("ace/requirejs/text!ace/css/editor.css"); +var oop = require("./lib/oop"); +var dom = require("./lib/dom"); +var event = require("./lib/event"); +var useragent = require("./lib/useragent"); +var GutterLayer = require("./layer/gutter").Gutter; +var MarkerLayer = require("./layer/marker").Marker; +var TextLayer = require("./layer/text").Text; +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 VirtualRenderer = function(container, theme) { this.container = container; diff --git a/lib/ace/virtual_renderer_test.js b/lib/ace/virtual_renderer_test.js index 241205a9..22f7acfe 100644 --- a/lib/ace/virtual_renderer_test.js +++ b/lib/ace/virtual_renderer_test.js @@ -36,15 +36,15 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../support/paths"); - require("ace/test/mockdom"); + require("amd-loader"); + require("./test/mockdom"); } define(function(require, exports, module) { -var EditSession = require("ace/edit_session").EditSession; -var VirtualRenderer = require("ace/virtual_renderer").VirtualRenderer; -var assert = require("ace/test/assertions"); +var EditSession = require("./edit_session").EditSession; +var VirtualRenderer = require("./virtual_renderer").VirtualRenderer; +var assert = require("./test/assertions"); module.exports = { "test: screen2text the column should be rounded to the next character edge" : function() { diff --git a/lib/ace/worker/mirror.js b/lib/ace/worker/mirror.js index 18d4bbc4..2076fb2c 100644 --- a/lib/ace/worker/mirror.js +++ b/lib/ace/worker/mirror.js @@ -1,8 +1,8 @@ define(function(require, exports, module) { -var Document = require("ace/document").Document; -var lang = require("ace/lib/lang"); +var Document = require("../document").Document; +var lang = require("../lib/lang"); var Mirror = exports.Mirror = function(sender) { this.sender = sender; diff --git a/lib/ace/worker/worker.js b/lib/ace/worker/worker.js index 42fbdbfb..fb78b3fe 100644 --- a/lib/ace/worker/worker.js +++ b/lib/ace/worker/worker.js @@ -8,6 +8,7 @@ var window = { }; var require = function(id) { + console.log("require " + id) var module = require.modules[id]; if (module) { if (!module.initialized) { diff --git a/lib/ace/worker/worker_client.js b/lib/ace/worker/worker_client.js index 959f0d38..5a481c1d 100644 --- a/lib/ace/worker/worker_client.js +++ b/lib/ace/worker/worker_client.js @@ -37,8 +37,8 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop"); -var EventEmitter = require("ace/lib/event_emitter").EventEmitter; +var oop = require("../lib/oop"); +var EventEmitter = require("../lib/event_emitter").EventEmitter; var WorkerClient = function(topLevelNamespaces, packagedJs, module, classname) {