From be9b8a0f3fffecb744fe9f1c544bcdefcbcf9d72 Mon Sep 17 00:00:00 2001 From: Joe Walker Date: Tue, 23 Nov 2010 14:36:12 +0000 Subject: [PATCH] move oop.js into pilot --- build.js | 8 ++++---- lib/ace/background_tokenizer.js | 2 +- lib/ace/document.js | 2 +- lib/ace/editor.js | 2 +- lib/ace/layer/text.js | 2 +- lib/ace/mode/css.js | 2 +- lib/ace/mode/css_highlight_rules.js | 2 +- lib/ace/mode/doc_comment_highlight_rules.js | 2 +- lib/ace/mode/html.js | 2 +- lib/ace/mode/html_highlight_rules.js | 2 +- lib/ace/mode/javascript.js | 2 +- lib/ace/mode/javascript_highlight_rules.js | 2 +- lib/ace/mode/xml.js | 2 +- lib/ace/mode/xml_highlight_rules.js | 2 +- lib/ace/scrollbar.js | 2 +- lib/ace/search.js | 2 +- lib/ace/selection.js | 2 +- lib/ace/test/event_emitter_test.js | 2 +- lib/ace/virtual_renderer.js | 2 +- {lib/ace => plugins/pilot}/lib/oop.js | 0 20 files changed, 22 insertions(+), 22 deletions(-) rename {lib/ace => plugins/pilot}/lib/oop.js (100%) diff --git a/build.js b/build.js index 0f2eef83..0dff8958 100644 --- a/build.js +++ b/build.js @@ -41,13 +41,13 @@ exclude: [ "pilot/lang", "pilot/dom", - "ace/lib/oop" + "pilot/oop" ] }, { name: "ace/mode/xml", exclude: [ - "ace/lib/oop", + "pilot/oop", "ace/tokenizer", "ace/mode/text" ] @@ -55,7 +55,7 @@ { name: "ace/mode/css", exclude: [ - "ace/lib/oop", + "pilot/oop", "pilot/lang", "ace/tokenizer", "ace/range", @@ -65,7 +65,7 @@ { name: "ace/mode/html", exclude: [ - "ace/lib/oop", + "pilot/oop", "pilot/lang", "ace/tokenizer", "ace/range", diff --git a/lib/ace/background_tokenizer.js b/lib/ace/background_tokenizer.js index 21539d69..642ffb7a 100644 --- a/lib/ace/background_tokenizer.js +++ b/lib/ace/background_tokenizer.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop").oop; +var oop = require("pilot/oop").oop; var MEventEmitter = require("ace/event_emitter").MEventEmitter; var BackgroundTokenizer = function(tokenizer, editor) { diff --git a/lib/ace/document.js b/lib/ace/document.js index 40c67ab1..51def67b 100644 --- a/lib/ace/document.js +++ b/lib/ace/document.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop").oop; +var oop = require("pilot/oop").oop; var lang = require("pilot/lang").lang; var MEventEmitter = require("ace/event_emitter").MEventEmitter; var Selection = require("ace/selection").Selection; diff --git a/lib/ace/editor.js b/lib/ace/editor.js index 7fc87d25..4953330c 100644 --- a/lib/ace/editor.js +++ b/lib/ace/editor.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop").oop; +var oop = require("pilot/oop").oop; var event = require("pilot/event").event; var lang = require("pilot/lang").lang; var TextInput = require("ace/textinput").TextInput; diff --git a/lib/ace/layer/text.js b/lib/ace/layer/text.js index be8d9dd2..7fef701e 100644 --- a/lib/ace/layer/text.js +++ b/lib/ace/layer/text.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop").oop; +var oop = require("pilot/oop").oop; var dom = require("pilot/dom").dom; var MEventEmitter = require("ace/event_emitter").MEventEmitter; diff --git a/lib/ace/mode/css.js b/lib/ace/mode/css.js index 743f5863..4c6bd198 100644 --- a/lib/ace/mode/css.js +++ b/lib/ace/mode/css.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop").oop; +var oop = require("pilot/oop").oop; var TextMode = require("ace/mode/text").Text; var Tokenizer = require("ace/tokenizer").Tokenizer; var CssHighlightRules = require("ace/mode/css_highlight_rules").CssHighlightRules; diff --git a/lib/ace/mode/css_highlight_rules.js b/lib/ace/mode/css_highlight_rules.js index e5f79e8e..a4445f41 100644 --- a/lib/ace/mode/css_highlight_rules.js +++ b/lib/ace/mode/css_highlight_rules.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop").oop; +var oop = require("pilot/oop").oop; var lang = require("pilot/lang").lang; var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules; diff --git a/lib/ace/mode/doc_comment_highlight_rules.js b/lib/ace/mode/doc_comment_highlight_rules.js index ac9dda55..48812aed 100644 --- a/lib/ace/mode/doc_comment_highlight_rules.js +++ b/lib/ace/mode/doc_comment_highlight_rules.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop").oop; +var oop = require("pilot/oop").oop; var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules; var DocCommentHighlightRules = function() { diff --git a/lib/ace/mode/html.js b/lib/ace/mode/html.js index b078fcd6..f6587676 100644 --- a/lib/ace/mode/html.js +++ b/lib/ace/mode/html.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop").oop; +var oop = require("pilot/oop").oop; var TextMode = require("ace/mode/text").Text; var JavaScriptMode = require("ace/mode/javascript").JavaScript; var CssMode = require("ace/mode/css").Css; diff --git a/lib/ace/mode/html_highlight_rules.js b/lib/ace/mode/html_highlight_rules.js index 4ba538c6..be441552 100644 --- a/lib/ace/mode/html_highlight_rules.js +++ b/lib/ace/mode/html_highlight_rules.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop").oop; +var oop = require("pilot/oop").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; diff --git a/lib/ace/mode/javascript.js b/lib/ace/mode/javascript.js index 64a86d1b..d39bb846 100644 --- a/lib/ace/mode/javascript.js +++ b/lib/ace/mode/javascript.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop").oop; +var oop = require("pilot/oop").oop; var TextMode = require("ace/mode/text").Text; var Tokenizer = require("ace/tokenizer").Tokenizer; var JavaScriptHighlightRules = require("ace/mode/javascript_highlight_rules").JavaScriptHighlightRules; diff --git a/lib/ace/mode/javascript_highlight_rules.js b/lib/ace/mode/javascript_highlight_rules.js index a7a6ad0d..0cbad802 100644 --- a/lib/ace/mode/javascript_highlight_rules.js +++ b/lib/ace/mode/javascript_highlight_rules.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop").oop; +var oop = require("pilot/oop").oop; var lang = require("pilot/lang").lang; var DocCommentHighlightRules = require("ace/mode/doc_comment_highlight_rules").DocCommentHighlightRules; var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules; diff --git a/lib/ace/mode/xml.js b/lib/ace/mode/xml.js index a8fb60ca..0a83adb1 100644 --- a/lib/ace/mode/xml.js +++ b/lib/ace/mode/xml.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop").oop; +var oop = require("pilot/oop").oop; var TextMode = require("ace/mode/text").Text; var Tokenizer = require("ace/tokenizer").Tokenizer; var XmlHighlightRules = require("ace/mode/xml_highlight_rules").XmlHighlightRules; diff --git a/lib/ace/mode/xml_highlight_rules.js b/lib/ace/mode/xml_highlight_rules.js index 923a092e..b1c6e874 100644 --- a/lib/ace/mode/xml_highlight_rules.js +++ b/lib/ace/mode/xml_highlight_rules.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop").oop; +var oop = require("pilot/oop").oop; var TextHighlightRules = require("ace/mode/text_highlight_rules").TextHighlightRules; var XmlHighlightRules = function() { diff --git a/lib/ace/scrollbar.js b/lib/ace/scrollbar.js index da10d301..042e2e0c 100644 --- a/lib/ace/scrollbar.js +++ b/lib/ace/scrollbar.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop").oop; +var oop = require("pilot/oop").oop; var lang = require("pilot/lang").lang; var dom = require("pilot/dom").dom; var event = require("pilot/event").event; diff --git a/lib/ace/search.js b/lib/ace/search.js index 815c5cd4..3ea5eba0 100644 --- a/lib/ace/search.js +++ b/lib/ace/search.js @@ -38,7 +38,7 @@ define(function(require, exports, module) { var lang = require("pilot/lang").lang; -var oop = require("ace/lib/oop").oop; +var oop = require("pilot/oop").oop; var Range = require("ace/range").Range; var Search = function() { diff --git a/lib/ace/selection.js b/lib/ace/selection.js index 82d1af65..062d5077 100644 --- a/lib/ace/selection.js +++ b/lib/ace/selection.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop").oop; +var oop = require("pilot/oop").oop; var lang = require("pilot/lang").lang; var MEventEmitter = require("ace/event_emitter").MEventEmitter; var Range = require("ace/range").Range; diff --git a/lib/ace/test/event_emitter_test.js b/lib/ace/test/event_emitter_test.js index 05881cdd..a5ee56ee 100644 --- a/lib/ace/test/event_emitter_test.js +++ b/lib/ace/test/event_emitter_test.js @@ -38,7 +38,7 @@ define(function(require, exports, module) { var MEventEmitter = require("ace/event_emitter").MEventEmitter; -var oop = require("ace/lib/oop").oop; +var oop = require("pilot/oop").oop; var EventEmitter = function() {}; diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js index 6cbdd48e..2c3e74e7 100644 --- a/lib/ace/virtual_renderer.js +++ b/lib/ace/virtual_renderer.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var oop = require("ace/lib/oop").oop; +var oop = require("pilot/oop").oop; var lang = require("pilot/lang").lang; var dom = require("pilot/dom").dom; var event = require("pilot/event").event; diff --git a/lib/ace/lib/oop.js b/plugins/pilot/lib/oop.js similarity index 100% rename from lib/ace/lib/oop.js rename to plugins/pilot/lib/oop.js