diff --git a/build.js b/build.js index 41dfa4a6..522bd244 100644 --- a/build.js +++ b/build.js @@ -29,40 +29,40 @@ "ace/document", "ace/undomanager", "ace/virtual_renderer", - + "ace/mode/javascript", "ace/theme/textmate" ], includeRequire: false }, - - { - name: "ace/theme/eclipse", + + { + name: "ace/theme/eclipse", exclude: [ "ace/lib/lang", - "ace/lib/dom", + "pilot/dom", "ace/lib/oop" ] }, - { + { name: "ace/mode/xml", exclude: [ "ace/lib/oop", "ace/tokenizer", - "ace/mode/text" + "ace/mode/text" ] }, - { + { name: "ace/mode/css", exclude: [ "ace/lib/oop", "ace/lib/lang", "ace/tokenizer", "ace/range", - "ace/mode/text" + "ace/mode/text" ] }, - { + { name: "ace/mode/html", exclude: [ "ace/lib/oop", diff --git a/lib/ace/layer/cursor.js b/lib/ace/layer/cursor.js index 63df911b..57ffc7f7 100644 --- a/lib/ace/layer/cursor.js +++ b/lib/ace/layer/cursor.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { -var dom = require("ace/lib/dom").dom; +var dom = require("pilot/dom").dom; var Cursor = function(parentEl) { this.element = document.createElement("div"); @@ -120,7 +120,7 @@ var Cursor = function(parentEl) { this.update = function(config) { if (!this.position) return; - + this.config = config; var cursorLeft = Math.round(this.position.column * config.characterWidth); diff --git a/lib/ace/layer/text.js b/lib/ace/layer/text.js index bd610b52..be8d9dd2 100644 --- a/lib/ace/layer/text.js +++ b/lib/ace/layer/text.js @@ -38,7 +38,7 @@ define(function(require, exports, module) { var oop = require("ace/lib/oop").oop; -var dom = require("ace/lib/dom").dom; +var dom = require("pilot/dom").dom; var MEventEmitter = require("ace/event_emitter").MEventEmitter; var Text = function(parentEl) { @@ -154,7 +154,7 @@ var Text = function(parentEl) { this.tokenizer.getTokens(first, last, function(tokens) { for ( var i = first; i <= last; i++) { var lineElement = lineElements[i - layerConfig.firstRow]; - if (!lineElement) + if (!lineElement) continue; var html = []; diff --git a/lib/ace/scrollbar.js b/lib/ace/scrollbar.js index 8072f65c..5d39c77b 100644 --- a/lib/ace/scrollbar.js +++ b/lib/ace/scrollbar.js @@ -39,7 +39,7 @@ define(function(require, exports, module) { var oop = require("ace/lib/oop").oop; var lang = require("ace/lib/lang").lang; -var dom = require("ace/lib/dom").dom; +var dom = require("pilot/dom").dom; var event = require("ace/lib/event").event; var MEventEmitter = require("ace/event_emitter").MEventEmitter; diff --git a/lib/ace/theme/clouds.js b/lib/ace/theme/clouds.js index 5af60b1c..6f1fa494 100644 --- a/lib/ace/theme/clouds.js +++ b/lib/ace/theme/clouds.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { - var dom = require("ace/lib/dom").dom; + var dom = require("pilot/dom").dom; var cssText = ".ace-clouds .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ @@ -187,9 +187,9 @@ define(function(require, exports, module) { .ace-clouds .ace_xml_pe {\ \ }"; - + // import CSS once dom.importCssString(cssText); - + exports.cssClass = "ace-clouds"; }); diff --git a/lib/ace/theme/clouds_mignight.js b/lib/ace/theme/clouds_mignight.js index 130af6f4..d73350f2 100644 --- a/lib/ace/theme/clouds_mignight.js +++ b/lib/ace/theme/clouds_mignight.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { - var dom = require("ace/lib/dom").dom; + var dom = require("pilot/dom").dom; var cssText = ".ace-clouds-midnight .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ @@ -188,9 +188,9 @@ background-color:#E92E2E;\ .ace-clouds-midnight .ace_xml_pe {\ \ }"; - + // import CSS once dom.importCssString(cssText); - + exports.cssClass = "ace-clouds-midnight"; }); diff --git a/lib/ace/theme/cobalt.js b/lib/ace/theme/cobalt.js index 13e95a90..5ae45ca1 100644 --- a/lib/ace/theme/cobalt.js +++ b/lib/ace/theme/cobalt.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { - var dom = require("ace/lib/dom").dom; + var dom = require("pilot/dom").dom; var cssText = ".ace-cobalt .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ @@ -189,9 +189,9 @@ color:#0088FF;\ .ace-cobalt .ace_xml_pe {\ \ }"; - + // import CSS once dom.importCssString(cssText); - + exports.cssClass = "ace-cobalt"; }); diff --git a/lib/ace/theme/dawn.js b/lib/ace/theme/dawn.js index 638ad9c4..02a46140 100644 --- a/lib/ace/theme/dawn.js +++ b/lib/ace/theme/dawn.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { - var dom = require("ace/lib/dom").dom; + var dom = require("pilot/dom").dom; var cssText = ".ace-dawn .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ @@ -193,9 +193,9 @@ color:#5A525F;\ .ace-dawn .ace_xml_pe {\ \ }"; - + // import CSS once dom.importCssString(cssText); - + exports.cssClass = "ace-dawn"; }); diff --git a/lib/ace/theme/eclipse.js b/lib/ace/theme/eclipse.js index 9a03f9e9..9545a5eb 100644 --- a/lib/ace/theme/eclipse.js +++ b/lib/ace/theme/eclipse.js @@ -37,9 +37,9 @@ define(function(require, exports, module) { - var dom = require("ace/lib/dom").dom; + var dom = require("pilot/dom").dom; var cssText = require("text!ace/theme/eclipse.css"); - + // import CSS once dom.importCssString(cssText); diff --git a/lib/ace/theme/idle_fingers.js b/lib/ace/theme/idle_fingers.js index a236413b..c0e3733a 100644 --- a/lib/ace/theme/idle_fingers.js +++ b/lib/ace/theme/idle_fingers.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { - var dom = require("ace/lib/dom").dom; + var dom = require("pilot/dom").dom; var cssText = ".ace-idle-fingers .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ @@ -189,9 +189,9 @@ color:#BC9458;\ .ace-idle-fingers .ace_xml_pe {\ \ }"; - + // import CSS once dom.importCssString(cssText); - + exports.cssClass = "ace-idle-fingers"; }); diff --git a/lib/ace/theme/kr_theme.js b/lib/ace/theme/kr_theme.js index 07ddfb0c..164232d7 100644 --- a/lib/ace/theme/kr_theme.js +++ b/lib/ace/theme/kr_theme.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { - var dom = require("ace/lib/dom").dom; + var dom = require("pilot/dom").dom; var cssText = ".ace-kr-theme .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ @@ -189,9 +189,9 @@ color:#706D5B;\ .ace-kr-theme .ace_xml_pe {\ \ }"; - + // import CSS once dom.importCssString(cssText); - + exports.cssClass = "ace-kr-theme"; }); diff --git a/lib/ace/theme/mono_industrial.js b/lib/ace/theme/mono_industrial.js index d9ac5845..20a0efbb 100644 --- a/lib/ace/theme/mono_industrial.js +++ b/lib/ace/theme/mono_industrial.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { - var dom = require("ace/lib/dom").dom; + var dom = require("pilot/dom").dom; var cssText = ".ace-mono-industrial .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ @@ -189,9 +189,9 @@ background-color:#151C19;\ .ace-mono-industrial .ace_xml_pe {\ \ }"; - + // import CSS once dom.importCssString(cssText); - + exports.cssClass = "ace-mono-industrial"; }); diff --git a/lib/ace/theme/monokai.js b/lib/ace/theme/monokai.js index 5bb1f5f5..3e116bc6 100644 --- a/lib/ace/theme/monokai.js +++ b/lib/ace/theme/monokai.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { - var dom = require("ace/lib/dom").dom; + var dom = require("pilot/dom").dom; var cssText = ".ace-monokai .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ @@ -189,9 +189,9 @@ background-color:#AE81FF;\ .ace-monokai .ace_xml_pe {\ \ }"; - + // import CSS once dom.importCssString(cssText); - + exports.cssClass = "ace-monokai"; }); diff --git a/lib/ace/theme/textmate.js b/lib/ace/theme/textmate.js index 30689c83..19d65d27 100644 --- a/lib/ace/theme/textmate.js +++ b/lib/ace/theme/textmate.js @@ -37,11 +37,11 @@ define(function(require, exports, module) { - var dom = require("ace/lib/dom").dom; + var dom = require("pilot/dom").dom; var cssText = require("text!ace/theme/tm.css"); // import CSS once dom.importCssString(cssText); - + exports.cssClass = "ace-tm"; }); diff --git a/lib/ace/theme/twilight.js b/lib/ace/theme/twilight.js index 74e3ff90..dba0f7a4 100644 --- a/lib/ace/theme/twilight.js +++ b/lib/ace/theme/twilight.js @@ -37,7 +37,7 @@ define(function(require, exports, module) { - var dom = require("ace/lib/dom").dom; + var dom = require("pilot/dom").dom; var cssText = ".ace-twilight .ace_editor {\ border: 2px solid rgb(159, 159, 159);\ @@ -191,9 +191,9 @@ color:#5F5A60;\ .ace-twilight .ace_xml_pe {\ color:#494949;\ }"; - + // import CSS once dom.importCssString(cssText); - + exports.cssClass = "ace-twilight"; }); diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js index a24c7080..b2be79e3 100644 --- a/lib/ace/virtual_renderer.js +++ b/lib/ace/virtual_renderer.js @@ -39,7 +39,7 @@ define(function(require, exports, module) { var oop = require("ace/lib/oop").oop; var lang = require("ace/lib/lang").lang; -var dom = require("ace/lib/dom").dom; +var dom = require("pilot/dom").dom; var event = require("ace/lib/event").event; var GutterLayer = require("ace/layer/gutter").Gutter; var MarkerLayer = require("ace/layer/marker").Marker; @@ -113,7 +113,7 @@ var VirtualRenderer = function(container, theme) { this.$loop = new RenderLoop(lang.bind(this.$renderChanges, this)); this.$loop.schedule(this.CHANGE_FULL); - + this.$updatePrintMargin(); this.setPadding(4); }; @@ -260,7 +260,7 @@ var VirtualRenderer = function(container, theme) { this.getPrintMarginColumn = function() { return this.$printMarginColumn; }; - + this.setShowGutter = function(show){ this.$gutter.style.display = show ? "block" : "none"; this.showGutter = show; @@ -293,18 +293,18 @@ var VirtualRenderer = function(container, theme) { this.getFirstVisibleRow = function() { return (this.layerConfig || {}).firstRow || 0; }; - + this.getFirstFullyVisibleRow = function(){ if (!this.layerConfig) return 0; - + return this.layerConfig.firstRow + (this.layerConfig.offset == 0 ? 0 : 1); } this.getLastFullyVisibleRow = function() { if (!this.layerConfig) return 0; - + var flint = Math.floor((this.layerConfig.height + this.layerConfig.offset) / this.layerConfig.lineHeight); return this.layerConfig.firstRow - 1 + flint; } @@ -376,8 +376,8 @@ var VirtualRenderer = function(container, theme) { this.showGutter && this.$gutterLayer.update(this.layerConfig); } else if (changes & this.CHANGE_LINES) { - this.$updateLines(); - this.$updateScrollBar(); + this.$updateLines(); + this.$updateScrollBar(); } else if (changes & this.CHANGE_SCROLL) { this.$textLayer.scrollLines(this.layerConfig); @@ -477,17 +477,17 @@ var VirtualRenderer = function(container, theme) { this.$markerLayer.removeMarker(markerId); this.$loop.schedule(this.CHANGE_MARKER); }; - + this.addGutterDecoration = function(row, className){ this.$gutterLayer.addGutterDecoration(row, className); this.$loop.schedule(this.CHANGE_GUTTER); } - + this.removeGutterDecoration = function(row, className){ this.$gutterLayer.removeGutterDecoration(row, className); this.$loop.schedule(this.CHANGE_GUTTER); } - + this.setBreakpoints = function(rows) { this.$gutterLayer.setBreakpoints(rows); this.$loop.schedule(this.CHANGE_GUTTER); @@ -535,7 +535,7 @@ var VirtualRenderer = function(container, theme) { this.getScrollTop = function() { return this.scrollTop; }; - + this.getScrollLeft = function() { return this.scroller.scrollLeft; }; @@ -557,7 +557,7 @@ var VirtualRenderer = function(container, theme) { this.$loop.schedule(this.CHANGE_SCROLL); } }; - + this.scrollToX = function(scrollLeft) { if (scrollLeft <= this.$padding) scrollLeft = 0; @@ -586,10 +586,10 @@ var VirtualRenderer = function(container, theme) { this.textToScreenCoordinates = function(row, column) { var canvasPos = this.scroller.getBoundingClientRect(); - + var x = this.padding + Math.round(this.doc.documentToScreenColumn(row, column) * this.characterWidth); var y = row * this.lineHeight; - + return { pageX: canvasPos.left + x - this.getScrollLeft(), pageY: canvasPos.top + y - this.getScrollTop() diff --git a/lib/ace/lib/dom.js b/plugins/pilot/lib/dom.js similarity index 100% rename from lib/ace/lib/dom.js rename to plugins/pilot/lib/dom.js diff --git a/tool/theme.tmpl.js b/tool/theme.tmpl.js index d7cd7f73..38a23553 100644 --- a/tool/theme.tmpl.js +++ b/tool/theme.tmpl.js @@ -1,10 +1,10 @@ define(function(require, exports, module) { - var dom = require("ace/lib/dom"); + var dom = require("pilot/dom"); var cssText = %css%; - + // import CSS once dom.importCssString(cssText); - + return { cssClass: "%cssClass%" };