From 0ce6f734d455f5e2b924757d25f59f24ac07a2a3 Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Thu, 4 Aug 2011 16:20:51 +0200 Subject: [PATCH] move document into the model folder --- ace/anchor_test.js | 4 ++-- ace/editor_change_document_test.js | 2 +- ace/editor_highlight_selected_word_test.js | 2 +- ace/editor_navigation_test.js | 2 +- ace/editor_text_edit_test.js | 2 +- ace/mode/coffee/parser_test.js | 2 +- ace/mode/css_test.js | 2 +- ace/mode/css_tokenizer_test.js | 2 +- ace/mode/css_worker_test.js | 2 +- ace/mode/html_test.js | 2 +- ace/mode/html_tokenizer_test.js | 2 +- ace/mode/javascript_test.js | 2 +- ace/mode/javascript_tokenizer_test.js | 2 +- ace/mode/javascript_worker_test.js | 2 +- ace/mode/ruby_tokenizer_test.js | 2 +- ace/mode/text_test.js | 2 +- ace/mode/xml_test.js | 2 +- ace/mode/xml_tokenizer_test.js | 2 +- ace/model/buffer.js | 2 +- ace/model/buffer_test.js | 2 +- ace/{ => model}/document.js | 0 ace/{ => model}/document_test.js | 2 +- ace/model/editor_test.js | 2 +- ace/model/window_test.js | 2 +- ace/range_test.js | 2 +- ace/search_test.js | 2 +- ace/selection_test.js | 2 +- ace/test/all.js | 2 +- ace/test/all_browser.js | 11 +++-------- ace/test/benchmark.js | 2 +- ace/test/event_emitter_test.js | 2 +- ace/view/layer/text_text.js | 2 +- ace/view/window_view_test.js | 2 +- ace/worker/mirror.js | 2 +- support/paths.js | 1 + 35 files changed, 37 insertions(+), 41 deletions(-) rename ace/{ => model}/document.js (100%) rename ace/{ => model}/document_test.js (99%) diff --git a/ace/anchor_test.js b/ace/anchor_test.js index 00073a54..88a3255b 100644 --- a/ace/anchor_test.js +++ b/ace/anchor_test.js @@ -36,12 +36,12 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../support/paths"); + require("../support/paths"); } define(function(require, exports, module) { -var Document = require("ace/document").Document; +var Document = require("ace/model/document").Document; var Anchor = require("ace/anchor").Anchor; var Range = require("ace/range").Range; var assert = require("ace/test/assertions"); diff --git a/ace/editor_change_document_test.js b/ace/editor_change_document_test.js index 8bd2b937..1d5ac11f 100644 --- a/ace/editor_change_document_test.js +++ b/ace/editor_change_document_test.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../support/paths"); + require("../support/paths"); require("ace/test/mockdom"); } diff --git a/ace/editor_highlight_selected_word_test.js b/ace/editor_highlight_selected_word_test.js index e32f5523..e7a5ec00 100644 --- a/ace/editor_highlight_selected_word_test.js +++ b/ace/editor_highlight_selected_word_test.js @@ -37,7 +37,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../support/paths"); + require("../support/paths"); } define(function(require, exports, module) { diff --git a/ace/editor_navigation_test.js b/ace/editor_navigation_test.js index f1475f75..34d8db2e 100644 --- a/ace/editor_navigation_test.js +++ b/ace/editor_navigation_test.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../support/paths"); + require("../support/paths"); require("ace/test/mockdom"); } diff --git a/ace/editor_text_edit_test.js b/ace/editor_text_edit_test.js index 1e1a5c35..156f49ef 100644 --- a/ace/editor_text_edit_test.js +++ b/ace/editor_text_edit_test.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../support/paths"); + require("../support/paths"); require("ace/test/mockdom"); } diff --git a/ace/mode/coffee/parser_test.js b/ace/mode/coffee/parser_test.js index 11cae970..2515c8e5 100644 --- a/ace/mode/coffee/parser_test.js +++ b/ace/mode/coffee/parser_test.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../../support/paths"); + require("../../../support/paths"); } define(function(require, exports, module) { diff --git a/ace/mode/css_test.js b/ace/mode/css_test.js index 23f94382..03df8958 100644 --- a/ace/mode/css_test.js +++ b/ace/mode/css_test.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("../../support/paths"); } define(function(require, exports, module) { diff --git a/ace/mode/css_tokenizer_test.js b/ace/mode/css_tokenizer_test.js index ffb39fe9..41f6da7b 100644 --- a/ace/mode/css_tokenizer_test.js +++ b/ace/mode/css_tokenizer_test.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("../../support/paths"); } define(function(require, exports, module) { diff --git a/ace/mode/css_worker_test.js b/ace/mode/css_worker_test.js index fb34d3ea..31a036a6 100644 --- a/ace/mode/css_worker_test.js +++ b/ace/mode/css_worker_test.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("../../support/paths"); } define(function(require, exports, module) { diff --git a/ace/mode/html_test.js b/ace/mode/html_test.js index ddb7059c..d3ecc01e 100644 --- a/ace/mode/html_test.js +++ b/ace/mode/html_test.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("../../support/paths"); } define(function(require, exports, module) { diff --git a/ace/mode/html_tokenizer_test.js b/ace/mode/html_tokenizer_test.js index 9ba6dc4f..7f602766 100644 --- a/ace/mode/html_tokenizer_test.js +++ b/ace/mode/html_tokenizer_test.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("../../support/paths"); } define(function(require, exports, module) { diff --git a/ace/mode/javascript_test.js b/ace/mode/javascript_test.js index e4a7ad32..87ce81f9 100644 --- a/ace/mode/javascript_test.js +++ b/ace/mode/javascript_test.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("../../support/paths"); } define(function(require, exports, module) { diff --git a/ace/mode/javascript_tokenizer_test.js b/ace/mode/javascript_tokenizer_test.js index 3aa4aaa9..69d9fbd0 100644 --- a/ace/mode/javascript_tokenizer_test.js +++ b/ace/mode/javascript_tokenizer_test.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("../../support/paths"); } define(function(require, exports, module) { diff --git a/ace/mode/javascript_worker_test.js b/ace/mode/javascript_worker_test.js index 211b927e..399e256c 100644 --- a/ace/mode/javascript_worker_test.js +++ b/ace/mode/javascript_worker_test.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("../../support/paths"); } define(function(require, exports, module) { diff --git a/ace/mode/ruby_tokenizer_test.js b/ace/mode/ruby_tokenizer_test.js index b4aed103..49dd55c1 100644 --- a/ace/mode/ruby_tokenizer_test.js +++ b/ace/mode/ruby_tokenizer_test.js @@ -37,7 +37,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("../../support/paths"); } define(function(require, exports, module) { diff --git a/ace/mode/text_test.js b/ace/mode/text_test.js index fe80f7a2..9e19969f 100644 --- a/ace/mode/text_test.js +++ b/ace/mode/text_test.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("../../support/paths"); } define(function(require, exports, module) { diff --git a/ace/mode/xml_test.js b/ace/mode/xml_test.js index 0ba99ce3..efc7e7fa 100644 --- a/ace/mode/xml_test.js +++ b/ace/mode/xml_test.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("../../support/paths"); } define(function(require, exports, module) { diff --git a/ace/mode/xml_tokenizer_test.js b/ace/mode/xml_tokenizer_test.js index ef384360..f7e8d09f 100644 --- a/ace/mode/xml_tokenizer_test.js +++ b/ace/mode/xml_tokenizer_test.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("../../support/paths"); } define(function(require, exports, module) { diff --git a/ace/model/buffer.js b/ace/model/buffer.js index b83b537f..f8c43232 100644 --- a/ace/model/buffer.js +++ b/ace/model/buffer.js @@ -46,7 +46,7 @@ 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 Document = require("ace/model/document").Document; var BackgroundTokenizer = require("ace/background_tokenizer").BackgroundTokenizer; var Buffer = function(text, mode) { diff --git a/ace/model/buffer_test.js b/ace/model/buffer_test.js index 3650179c..c14f9346 100644 --- a/ace/model/buffer_test.js +++ b/ace/model/buffer_test.js @@ -37,7 +37,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("../../support/paths"); require("ace/test/mockdom"); } diff --git a/ace/document.js b/ace/model/document.js similarity index 100% rename from ace/document.js rename to ace/model/document.js diff --git a/ace/document_test.js b/ace/model/document_test.js similarity index 99% rename from ace/document_test.js rename to ace/model/document_test.js index 1a7587a8..de44fa5e 100644 --- a/ace/document_test.js +++ b/ace/model/document_test.js @@ -43,7 +43,7 @@ if (typeof process !== "undefined") { define(function(require, exports, module) { -var Document = require("ace/document").Document; +var Document = require("ace/model/document").Document; var Range = require("ace/range").Range; var assert = require("ace/test/assertions"); diff --git a/ace/model/editor_test.js b/ace/model/editor_test.js index fbeb1b77..bc9c8fb7 100644 --- a/ace/model/editor_test.js +++ b/ace/model/editor_test.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("../../support/paths"); require("ace/test/mockdom"); } diff --git a/ace/model/window_test.js b/ace/model/window_test.js index 7077a5ba..3b5f7c0d 100644 --- a/ace/model/window_test.js +++ b/ace/model/window_test.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("../../support/paths"); require("ace/test/mockdom"); } diff --git a/ace/range_test.js b/ace/range_test.js index a8beea60..88b62802 100644 --- a/ace/range_test.js +++ b/ace/range_test.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../support/paths"); + require("../support/paths"); } define(function(require, exports, module) { diff --git a/ace/search_test.js b/ace/search_test.js index 64370d41..da623205 100644 --- a/ace/search_test.js +++ b/ace/search_test.js @@ -37,7 +37,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../support/paths"); + require("../support/paths"); } define(function(require, exports, module) { diff --git a/ace/selection_test.js b/ace/selection_test.js index 52841346..5469f0ab 100644 --- a/ace/selection_test.js +++ b/ace/selection_test.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../support/paths"); + require("../support/paths"); } define(function(require, exports, module) { diff --git a/ace/test/all.js b/ace/test/all.js index 9b07a28e..08f764ca 100644 --- a/ace/test/all.js +++ b/ace/test/all.js @@ -35,7 +35,7 @@ * * ***** END LICENSE BLOCK ***** */ -require("../../../support/paths"); +require("../../support/paths"); var test = require("asyncjs").test; test.walkTestCases(__dirname + "/..").exec() \ No newline at end of file diff --git a/ace/test/all_browser.js b/ace/test/all_browser.js index 9b01d91d..5d69b3d4 100644 --- a/ace/test/all_browser.js +++ b/ace/test/all_browser.js @@ -1,12 +1,7 @@ define(function(require, exports, module) { -<<<<<<< HEAD -require("pilot/fixoldbrowsers"); -var AsyncTest = require("asyncjs/test"); -======= require("ace/lib/fixoldbrowsers"); var AsyncTest = require("asyncjs").test; ->>>>>>> move pilot code back into Ace var async = require("asyncjs"); var dom = require("ace/lib/dom"); @@ -16,7 +11,6 @@ var log = document.getElementById("log") var tests = [ require("ace/anchor_test"), - require("ace/document_test"), require("ace/edit_session_test"), require("ace/editor_change_document_test"), require("ace/editor_highlight_selected_word_test"), @@ -24,6 +18,8 @@ var tests = [ require("ace/editor_text_edit_test"), require("ace/layer/text_test"), require("ace/mode/coffee/parser_test"), + require("ace/model/document_test"), + require("ace/view/window_view_test"), require("ace/mode/css_test"), require("ace/mode/css_tokenizer_test"), require("ace/mode/css_worker"), @@ -39,8 +35,7 @@ var tests = [ require("ace/range_test"), require("ace/search_test"), require("ace/selection_test"), - require("ace/test/event_emitter_test"), - require("ace/virtual_renderer_test") + require("ace/test/event_emitter_test") ] async.list(tests) diff --git a/ace/test/benchmark.js b/ace/test/benchmark.js index 3c9b67ee..76fd7070 100644 --- a/ace/test/benchmark.js +++ b/ace/test/benchmark.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("../../support/paths"); } define(function(require, exports, module) { diff --git a/ace/test/event_emitter_test.js b/ace/test/event_emitter_test.js index 3c94f582..176f1a1d 100644 --- a/ace/test/event_emitter_test.js +++ b/ace/test/event_emitter_test.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("../../support/paths"); } define(function(require, exports, module) { diff --git a/ace/view/layer/text_text.js b/ace/view/layer/text_text.js index 0be74ead..7d3219a5 100644 --- a/ace/view/layer/text_text.js +++ b/ace/view/layer/text_text.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("../../support/paths"); require("ace/test/mockdom"); } diff --git a/ace/view/window_view_test.js b/ace/view/window_view_test.js index 454960e8..b883a1b8 100644 --- a/ace/view/window_view_test.js +++ b/ace/view/window_view_test.js @@ -36,7 +36,7 @@ * ***** END LICENSE BLOCK ***** */ if (typeof process !== "undefined") { - require("../../../support/paths"); + require("../../support/paths"); require("ace/test/mockdom"); } diff --git a/ace/worker/mirror.js b/ace/worker/mirror.js index 18d4bbc4..689ce840 100644 --- a/ace/worker/mirror.js +++ b/ace/worker/mirror.js @@ -1,7 +1,7 @@ define(function(require, exports, module) { -var Document = require("ace/document").Document; +var Document = require("ace/model/document").Document; var lang = require("ace/lib/lang"); var Mirror = exports.Mirror = function(sender) { diff --git a/support/paths.js b/support/paths.js index 316a9f82..1d77fa49 100644 --- a/support/paths.js +++ b/support/paths.js @@ -4,3 +4,4 @@ require.paths.unshift(__dirname + "/dryice/lib"); require.paths.unshift(__dirname + "/async/lib"); require.paths.unshift(__dirname + "/jsdom/lib"); require.paths.unshift(__dirname); +require.paths.unshift(__dirname + "/..");