jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move dom.js into pilot

Browse source
This commit is contained in:
Joe Walker 2010-11-23 14:27:44 +00:00
commit 87a15aaa5a
18 changed files with 64 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

20
build.js
View file

@ -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",

4
lib/ace/layer/cursor.js
View file

@ -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);

4
lib/ace/layer/text.js
View file

@ -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 = [];

2
lib/ace/scrollbar.js
View file

@ -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;

6
lib/ace/theme/clouds.js
View file

@ -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";
});

6
lib/ace/theme/clouds_mignight.js
View file

@ -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";
});

6
lib/ace/theme/cobalt.js
View file

@ -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";
});

6
lib/ace/theme/dawn.js
View file

@ -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";
});

4
lib/ace/theme/eclipse.js
View file

@ -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);

6
lib/ace/theme/idle_fingers.js
View file

@ -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";
});

6
lib/ace/theme/kr_theme.js
View file

@ -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";
});

6
lib/ace/theme/mono_industrial.js
View file

@ -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";
});

6
lib/ace/theme/monokai.js
View file

@ -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";
});

4
lib/ace/theme/textmate.js
View file

@ -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";
});

6
lib/ace/theme/twilight.js
View file

@ -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";
});

30
lib/ace/virtual_renderer.js
View file

@ -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()

0
lib/ace/lib/dom.js → plugins/pilot/lib/dom.js
View file

6
tool/theme.tmpl.js
View file

@ -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%"
};