move document into the model folder

This commit is contained in:
Fabian Jakobs 2011-08-04 16:20:51 +02:00
commit 0ce6f734d4
35 changed files with 37 additions and 41 deletions

View file

@ -36,12 +36,12 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../support/paths"); require("../support/paths");
} }
define(function(require, exports, module) { 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 Anchor = require("ace/anchor").Anchor;
var Range = require("ace/range").Range; var Range = require("ace/range").Range;
var assert = require("ace/test/assertions"); var assert = require("ace/test/assertions");

View file

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../support/paths"); require("../support/paths");
require("ace/test/mockdom"); require("ace/test/mockdom");
} }

View file

@ -37,7 +37,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../support/paths"); require("../support/paths");
} }
define(function(require, exports, module) { define(function(require, exports, module) {

View file

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../support/paths"); require("../support/paths");
require("ace/test/mockdom"); require("ace/test/mockdom");
} }

View file

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../support/paths"); require("../support/paths");
require("ace/test/mockdom"); require("ace/test/mockdom");
} }

View file

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../../../support/paths"); require("../../../support/paths");
} }
define(function(require, exports, module) { define(function(require, exports, module) {

View file

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../../support/paths"); require("../../support/paths");
} }
define(function(require, exports, module) { define(function(require, exports, module) {

View file

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../../support/paths"); require("../../support/paths");
} }
define(function(require, exports, module) { define(function(require, exports, module) {

View file

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../../support/paths"); require("../../support/paths");
} }
define(function(require, exports, module) { define(function(require, exports, module) {

View file

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../../support/paths"); require("../../support/paths");
} }
define(function(require, exports, module) { define(function(require, exports, module) {

View file

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../../support/paths"); require("../../support/paths");
} }
define(function(require, exports, module) { define(function(require, exports, module) {

View file

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../../support/paths"); require("../../support/paths");
} }
define(function(require, exports, module) { define(function(require, exports, module) {

View file

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../../support/paths"); require("../../support/paths");
} }
define(function(require, exports, module) { define(function(require, exports, module) {

View file

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../../support/paths"); require("../../support/paths");
} }
define(function(require, exports, module) { define(function(require, exports, module) {

View file

@ -37,7 +37,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../../support/paths"); require("../../support/paths");
} }
define(function(require, exports, module) { define(function(require, exports, module) {

View file

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../../support/paths"); require("../../support/paths");
} }
define(function(require, exports, module) { define(function(require, exports, module) {

View file

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../../support/paths"); require("../../support/paths");
} }
define(function(require, exports, module) { define(function(require, exports, module) {

View file

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../../support/paths"); require("../../support/paths");
} }
define(function(require, exports, module) { define(function(require, exports, module) {

View file

@ -46,7 +46,7 @@ var EventEmitter = require("ace/lib/event_emitter").EventEmitter;
var Selection = require("ace/selection").Selection; var Selection = require("ace/selection").Selection;
var TextMode = require("ace/mode/text").Mode; var TextMode = require("ace/mode/text").Mode;
var Range = require("ace/range").Range; 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 BackgroundTokenizer = require("ace/background_tokenizer").BackgroundTokenizer;
var Buffer = function(text, mode) { var Buffer = function(text, mode) {

View file

@ -37,7 +37,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../../support/paths"); require("../../support/paths");
require("ace/test/mockdom"); require("ace/test/mockdom");
} }

View file

@ -43,7 +43,7 @@ if (typeof process !== "undefined") {
define(function(require, exports, module) { 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 Range = require("ace/range").Range;
var assert = require("ace/test/assertions"); var assert = require("ace/test/assertions");

View file

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../../support/paths"); require("../../support/paths");
require("ace/test/mockdom"); require("ace/test/mockdom");
} }

View file

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../../support/paths"); require("../../support/paths");
require("ace/test/mockdom"); require("ace/test/mockdom");
} }

View file

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../support/paths"); require("../support/paths");
} }
define(function(require, exports, module) { define(function(require, exports, module) {

View file

@ -37,7 +37,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../support/paths"); require("../support/paths");
} }
define(function(require, exports, module) { define(function(require, exports, module) {

View file

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../support/paths"); require("../support/paths");
} }
define(function(require, exports, module) { define(function(require, exports, module) {

View file

@ -35,7 +35,7 @@
* *
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
require("../../../support/paths"); require("../../support/paths");
var test = require("asyncjs").test; var test = require("asyncjs").test;
test.walkTestCases(__dirname + "/..").exec() test.walkTestCases(__dirname + "/..").exec()

View file

@ -1,12 +1,7 @@
define(function(require, exports, module) { define(function(require, exports, module) {
<<<<<<< HEAD
require("pilot/fixoldbrowsers");
var AsyncTest = require("asyncjs/test");
=======
require("ace/lib/fixoldbrowsers"); require("ace/lib/fixoldbrowsers");
var AsyncTest = require("asyncjs").test; var AsyncTest = require("asyncjs").test;
>>>>>>> move pilot code back into Ace
var async = require("asyncjs"); var async = require("asyncjs");
var dom = require("ace/lib/dom"); var dom = require("ace/lib/dom");
@ -16,7 +11,6 @@ var log = document.getElementById("log")
var tests = [ var tests = [
require("ace/anchor_test"), require("ace/anchor_test"),
require("ace/document_test"),
require("ace/edit_session_test"), require("ace/edit_session_test"),
require("ace/editor_change_document_test"), require("ace/editor_change_document_test"),
require("ace/editor_highlight_selected_word_test"), require("ace/editor_highlight_selected_word_test"),
@ -24,6 +18,8 @@ var tests = [
require("ace/editor_text_edit_test"), require("ace/editor_text_edit_test"),
require("ace/layer/text_test"), require("ace/layer/text_test"),
require("ace/mode/coffee/parser_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_test"),
require("ace/mode/css_tokenizer_test"), require("ace/mode/css_tokenizer_test"),
require("ace/mode/css_worker"), require("ace/mode/css_worker"),
@ -39,8 +35,7 @@ var tests = [
require("ace/range_test"), require("ace/range_test"),
require("ace/search_test"), require("ace/search_test"),
require("ace/selection_test"), require("ace/selection_test"),
require("ace/test/event_emitter_test"), require("ace/test/event_emitter_test")
require("ace/virtual_renderer_test")
] ]
async.list(tests) async.list(tests)

View file

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../../support/paths"); require("../../support/paths");
} }
define(function(require, exports, module) { define(function(require, exports, module) {

View file

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../../support/paths"); require("../../support/paths");
} }
define(function(require, exports, module) { define(function(require, exports, module) {

View file

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../../support/paths"); require("../../support/paths");
require("ace/test/mockdom"); require("ace/test/mockdom");
} }

View file

@ -36,7 +36,7 @@
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
if (typeof process !== "undefined") { if (typeof process !== "undefined") {
require("../../../support/paths"); require("../../support/paths");
require("ace/test/mockdom"); require("ace/test/mockdom");
} }

View file

@ -1,7 +1,7 @@
define(function(require, exports, module) { 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 lang = require("ace/lib/lang");
var Mirror = exports.Mirror = function(sender) { var Mirror = exports.Mirror = function(sender) {

View file

@ -4,3 +4,4 @@ require.paths.unshift(__dirname + "/dryice/lib");
require.paths.unshift(__dirname + "/async/lib"); require.paths.unshift(__dirname + "/async/lib");
require.paths.unshift(__dirname + "/jsdom/lib"); require.paths.unshift(__dirname + "/jsdom/lib");
require.paths.unshift(__dirname); require.paths.unshift(__dirname);
require.paths.unshift(__dirname + "/..");