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

package

Browse source
This commit is contained in:
Fabian Jakobs 2012-04-11 17:48:22 +02:00
commit 99dedd25b5
7 changed files with 103 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

56
build/demo/kitchen-sink/kitchen-sink-uncompressed.js
View file

@ -11567,7 +11567,7 @@ var Editor = function(renderer, session) {
else else
lastRow = Infinity; lastRow = Infinity;
this.renderer.updateLines(range.start.row, lastRow); this.renderer.updateLines(range.start.row, lastRow);
this._emit("change", e); this._emit("change", e);
// update cursor because tab characters can influence the cursor position // update cursor because tab characters can influence the cursor position
@ -11609,21 +11609,29 @@ var Editor = function(renderer, session) {
this.$updateHighlightActiveLine = function() { this.$updateHighlightActiveLine = function() {
var session = this.getSession(); var session = this.getSession();
if (session.$highlightLineMarker) { if (session.$highlightLineMarker)
session.removeMarker(session.$highlightLineMarker); session.removeMarker(session.$highlightLineMarker);
} if (typeof this.$lastrow == "number")
session.$highlightLineMarker = null; this.renderer.removeGutterDecoration(this.$lastrow, "ace_gutter_active_line");
if (this.getHighlightActiveLine() && (this.getSelectionStyle() != "line" || !this.selection.isMultiLine())) { session.$highlightLineMarker = null;
this.$lastrow = null;
if (this.getHighlightActiveLine()) {
var cursor = this.getCursorPosition(), var cursor = this.getCursorPosition(),
foldLine = this.session.getFoldLine(cursor.row); foldLine = this.session.getFoldLine(cursor.row);
var range;
if (foldLine) { if ((this.getSelectionStyle() != "line" || !this.selection.isMultiLine())) {
range = new Range(foldLine.start.row, 0, foldLine.end.row + 1, 0); var range;
} else { if (foldLine) {
range = new Range(cursor.row, 0, cursor.row+1, 0); range = new Range(foldLine.start.row, 0, foldLine.end.row + 1, 0);
} else {
range = new Range(cursor.row, 0, cursor.row+1, 0);
}
session.$highlightLineMarker = session.addMarker(range, "ace_active_line", "background");
} }
session.$highlightLineMarker = session.addMarker(range, "ace_active_line", "background");
this.renderer.addGutterDecoration(this.$lastrow = cursor.row, "ace_gutter_active_line");
} }
}; };
@ -14726,10 +14734,6 @@ var VirtualRenderer = function(container, theme) {
this.$gutter.className = "ace_gutter"; this.$gutter.className = "ace_gutter";
this.container.appendChild(this.$gutter); this.container.appendChild(this.$gutter);
this.$corner = dom.createElement("div");
this.$corner.className = "ace_corner";
this.container.appendChild(this.$corner);
this.scroller = dom.createElement("div"); this.scroller = dom.createElement("div");
this.scroller.className = "ace_scroller"; this.scroller.className = "ace_scroller";
this.container.appendChild(this.scroller); this.container.appendChild(this.scroller);
@ -15675,11 +15679,11 @@ var Gutter = function(parentEl) {
this.addGutterDecoration = function(row, className){ this.addGutterDecoration = function(row, className){
if (!this.$decorations[row]) if (!this.$decorations[row])
this.$decorations[row] = ""; this.$decorations[row] = "";
this.$decorations[row] += " ace_" + className; this.$decorations[row] += " " + className;
}; };
this.removeGutterDecoration = function(row, className){ this.removeGutterDecoration = function(row, className){
this.$decorations[row] = this.$decorations[row].replace(" ace_" + className, ""); this.$decorations[row] = this.$decorations[row].replace(" " + className, "");
}; };
this.setBreakpoints = function(rows) { this.setBreakpoints = function(rows) {
@ -16930,20 +16934,6 @@ define("text!ace/css/editor.css", [], "@import url(//fonts.googleapis.com/css?fa
" z-index: 4;\n" + " z-index: 4;\n" +
"}\n" + "}\n" +
"\n" + "\n" +
".ace_corner{\n" +
" position : absolute;\n" +
" left : 41px;\n" +
" top : -5px;\n" +
" border-radius : 6px 0 0 0;\n" +
" border-color : #e8e8e8;\n" +
" border-width : 1px 0 0 1px;\n" +
" border-style : solid;\n" +
" box-shadow : 4px 4px 0px #e8e8e8 inset;\n" +
" width : 10px;\n" +
" height : 10px;\n" +
" z-index : 10000;\n" +
"}\n" +
"\n" +
".ace_gutter {\n" + ".ace_gutter {\n" +
" position: absolute;\n" + " position: absolute;\n" +
" overflow : hidden;\n" + " overflow : hidden;\n" +
@ -17091,6 +17081,10 @@ define("text!ace/css/editor.css", [], "@import url(//fonts.googleapis.com/css?fa
" z-index: 2;\n" + " z-index: 2;\n" +
"}\n" + "}\n" +
"\n" + "\n" +
".ace_gutter .ace_gutter_active_line{\n" +
" background-color : #dcdcdc;\n" +
"}\n" +
"\n" +
".ace_marker-layer .ace_selected_word {\n" + ".ace_marker-layer .ace_selected_word {\n" +
" position: absolute;\n" + " position: absolute;\n" +
" z-index: 6;\n" + " z-index: 6;\n" +

2
build/kitchen-sink.html
View file

@ -11,7 +11,7 @@
Ace Ace
version 0.2.0 version 0.2.0
commit d3f147cc7206d1ada554b7c290ac4619b1a8359e commit 4e28a1d31f8c6d5bc6b44aed291ee4bd0c73661f
--> -->

2
build/src/ace-noconflict.js
View file

File diff suppressed because one or more lines are too long

56
build/src/ace-uncompressed-noconflict.js
View file

@ -2677,7 +2677,7 @@ var Editor = function(renderer, session) {
else else
lastRow = Infinity; lastRow = Infinity;
this.renderer.updateLines(range.start.row, lastRow); this.renderer.updateLines(range.start.row, lastRow);
this._emit("change", e); this._emit("change", e);
// update cursor because tab characters can influence the cursor position // update cursor because tab characters can influence the cursor position
@ -2719,21 +2719,29 @@ var Editor = function(renderer, session) {
this.$updateHighlightActiveLine = function() { this.$updateHighlightActiveLine = function() {
var session = this.getSession(); var session = this.getSession();
if (session.$highlightLineMarker) { if (session.$highlightLineMarker)
session.removeMarker(session.$highlightLineMarker); session.removeMarker(session.$highlightLineMarker);
} if (typeof this.$lastrow == "number")
session.$highlightLineMarker = null; this.renderer.removeGutterDecoration(this.$lastrow, "ace_gutter_active_line");
if (this.getHighlightActiveLine() && (this.getSelectionStyle() != "line" || !this.selection.isMultiLine())) { session.$highlightLineMarker = null;
this.$lastrow = null;
if (this.getHighlightActiveLine()) {
var cursor = this.getCursorPosition(), var cursor = this.getCursorPosition(),
foldLine = this.session.getFoldLine(cursor.row); foldLine = this.session.getFoldLine(cursor.row);
var range;
if (foldLine) { if ((this.getSelectionStyle() != "line" || !this.selection.isMultiLine())) {
range = new Range(foldLine.start.row, 0, foldLine.end.row + 1, 0); var range;
} else { if (foldLine) {
range = new Range(cursor.row, 0, cursor.row+1, 0); range = new Range(foldLine.start.row, 0, foldLine.end.row + 1, 0);
} else {
range = new Range(cursor.row, 0, cursor.row+1, 0);
}
session.$highlightLineMarker = session.addMarker(range, "ace_active_line", "background");
} }
session.$highlightLineMarker = session.addMarker(range, "ace_active_line", "background");
this.renderer.addGutterDecoration(this.$lastrow = cursor.row, "ace_gutter_active_line");
} }
}; };
@ -11917,10 +11925,6 @@ var VirtualRenderer = function(container, theme) {
this.$gutter.className = "ace_gutter"; this.$gutter.className = "ace_gutter";
this.container.appendChild(this.$gutter); this.container.appendChild(this.$gutter);
this.$corner = dom.createElement("div");
this.$corner.className = "ace_corner";
this.container.appendChild(this.$corner);
this.scroller = dom.createElement("div"); this.scroller = dom.createElement("div");
this.scroller.className = "ace_scroller"; this.scroller.className = "ace_scroller";
this.container.appendChild(this.scroller); this.container.appendChild(this.scroller);
@ -12866,11 +12870,11 @@ var Gutter = function(parentEl) {
this.addGutterDecoration = function(row, className){ this.addGutterDecoration = function(row, className){
if (!this.$decorations[row]) if (!this.$decorations[row])
this.$decorations[row] = ""; this.$decorations[row] = "";
this.$decorations[row] += " ace_" + className; this.$decorations[row] += " " + className;
}; };
this.removeGutterDecoration = function(row, className){ this.removeGutterDecoration = function(row, className){
this.$decorations[row] = this.$decorations[row].replace(" ace_" + className, ""); this.$decorations[row] = this.$decorations[row].replace(" " + className, "");
}; };
this.setBreakpoints = function(rows) { this.setBreakpoints = function(rows) {
@ -14121,20 +14125,6 @@ ace.define("text!ace/css/editor.css", [], "@import url(//fonts.googleapis.com/cs
" z-index: 4;\n" + " z-index: 4;\n" +
"}\n" + "}\n" +
"\n" + "\n" +
".ace_corner{\n" +
" position : absolute;\n" +
" left : 41px;\n" +
" top : -5px;\n" +
" border-radius : 6px 0 0 0;\n" +
" border-color : #e8e8e8;\n" +
" border-width : 1px 0 0 1px;\n" +
" border-style : solid;\n" +
" box-shadow : 4px 4px 0px #e8e8e8 inset;\n" +
" width : 10px;\n" +
" height : 10px;\n" +
" z-index : 10000;\n" +
"}\n" +
"\n" +
".ace_gutter {\n" + ".ace_gutter {\n" +
" position: absolute;\n" + " position: absolute;\n" +
" overflow : hidden;\n" + " overflow : hidden;\n" +
@ -14282,6 +14272,10 @@ ace.define("text!ace/css/editor.css", [], "@import url(//fonts.googleapis.com/cs
" z-index: 2;\n" + " z-index: 2;\n" +
"}\n" + "}\n" +
"\n" + "\n" +
".ace_gutter .ace_gutter_active_line{\n" +
" background-color : #dcdcdc;\n" +
"}\n" +
"\n" +
".ace_marker-layer .ace_selected_word {\n" + ".ace_marker-layer .ace_selected_word {\n" +
" position: absolute;\n" + " position: absolute;\n" +
" z-index: 6;\n" + " z-index: 6;\n" +

56
build/src/ace-uncompressed.js
View file

@ -2677,7 +2677,7 @@ var Editor = function(renderer, session) {
else else
lastRow = Infinity; lastRow = Infinity;
this.renderer.updateLines(range.start.row, lastRow); this.renderer.updateLines(range.start.row, lastRow);
this._emit("change", e); this._emit("change", e);
// update cursor because tab characters can influence the cursor position // update cursor because tab characters can influence the cursor position
@ -2719,21 +2719,29 @@ var Editor = function(renderer, session) {
this.$updateHighlightActiveLine = function() { this.$updateHighlightActiveLine = function() {
var session = this.getSession(); var session = this.getSession();
if (session.$highlightLineMarker) { if (session.$highlightLineMarker)
session.removeMarker(session.$highlightLineMarker); session.removeMarker(session.$highlightLineMarker);
} if (typeof this.$lastrow == "number")
session.$highlightLineMarker = null; this.renderer.removeGutterDecoration(this.$lastrow, "ace_gutter_active_line");
if (this.getHighlightActiveLine() && (this.getSelectionStyle() != "line" || !this.selection.isMultiLine())) { session.$highlightLineMarker = null;
this.$lastrow = null;
if (this.getHighlightActiveLine()) {
var cursor = this.getCursorPosition(), var cursor = this.getCursorPosition(),
foldLine = this.session.getFoldLine(cursor.row); foldLine = this.session.getFoldLine(cursor.row);
var range;
if (foldLine) { if ((this.getSelectionStyle() != "line" || !this.selection.isMultiLine())) {
range = new Range(foldLine.start.row, 0, foldLine.end.row + 1, 0); var range;
} else { if (foldLine) {
range = new Range(cursor.row, 0, cursor.row+1, 0); range = new Range(foldLine.start.row, 0, foldLine.end.row + 1, 0);
} else {
range = new Range(cursor.row, 0, cursor.row+1, 0);
}
session.$highlightLineMarker = session.addMarker(range, "ace_active_line", "background");
} }
session.$highlightLineMarker = session.addMarker(range, "ace_active_line", "background");
this.renderer.addGutterDecoration(this.$lastrow = cursor.row, "ace_gutter_active_line");
} }
}; };
@ -11917,10 +11925,6 @@ var VirtualRenderer = function(container, theme) {
this.$gutter.className = "ace_gutter"; this.$gutter.className = "ace_gutter";
this.container.appendChild(this.$gutter); this.container.appendChild(this.$gutter);
this.$corner = dom.createElement("div");
this.$corner.className = "ace_corner";
this.container.appendChild(this.$corner);
this.scroller = dom.createElement("div"); this.scroller = dom.createElement("div");
this.scroller.className = "ace_scroller"; this.scroller.className = "ace_scroller";
this.container.appendChild(this.scroller); this.container.appendChild(this.scroller);
@ -12866,11 +12870,11 @@ var Gutter = function(parentEl) {
this.addGutterDecoration = function(row, className){ this.addGutterDecoration = function(row, className){
if (!this.$decorations[row]) if (!this.$decorations[row])
this.$decorations[row] = ""; this.$decorations[row] = "";
this.$decorations[row] += " ace_" + className; this.$decorations[row] += " " + className;
}; };
this.removeGutterDecoration = function(row, className){ this.removeGutterDecoration = function(row, className){
this.$decorations[row] = this.$decorations[row].replace(" ace_" + className, ""); this.$decorations[row] = this.$decorations[row].replace(" " + className, "");
}; };
this.setBreakpoints = function(rows) { this.setBreakpoints = function(rows) {
@ -14121,20 +14125,6 @@ define("text!ace/css/editor.css", [], "@import url(//fonts.googleapis.com/css?fa
" z-index: 4;\n" + " z-index: 4;\n" +
"}\n" + "}\n" +
"\n" + "\n" +
".ace_corner{\n" +
" position : absolute;\n" +
" left : 41px;\n" +
" top : -5px;\n" +
" border-radius : 6px 0 0 0;\n" +
" border-color : #e8e8e8;\n" +
" border-width : 1px 0 0 1px;\n" +
" border-style : solid;\n" +
" box-shadow : 4px 4px 0px #e8e8e8 inset;\n" +
" width : 10px;\n" +
" height : 10px;\n" +
" z-index : 10000;\n" +
"}\n" +
"\n" +
".ace_gutter {\n" + ".ace_gutter {\n" +
" position: absolute;\n" + " position: absolute;\n" +
" overflow : hidden;\n" + " overflow : hidden;\n" +
@ -14282,6 +14272,10 @@ define("text!ace/css/editor.css", [], "@import url(//fonts.googleapis.com/css?fa
" z-index: 2;\n" + " z-index: 2;\n" +
"}\n" + "}\n" +
"\n" + "\n" +
".ace_gutter .ace_gutter_active_line{\n" +
" background-color : #dcdcdc;\n" +
"}\n" +
"\n" +
".ace_marker-layer .ace_selected_word {\n" + ".ace_marker-layer .ace_selected_word {\n" +
" position: absolute;\n" + " position: absolute;\n" +
" z-index: 6;\n" + " z-index: 6;\n" +

2
build/src/ace.js
View file

File diff suppressed because one or more lines are too long

56
build/textarea/src/ace-bookmarklet.js
View file

@ -3244,7 +3244,7 @@ var Editor = function(renderer, session) {
else else
lastRow = Infinity; lastRow = Infinity;
this.renderer.updateLines(range.start.row, lastRow); this.renderer.updateLines(range.start.row, lastRow);
this._emit("change", e); this._emit("change", e);
// update cursor because tab characters can influence the cursor position // update cursor because tab characters can influence the cursor position
@ -3286,21 +3286,29 @@ var Editor = function(renderer, session) {
this.$updateHighlightActiveLine = function() { this.$updateHighlightActiveLine = function() {
var session = this.getSession(); var session = this.getSession();
if (session.$highlightLineMarker) { if (session.$highlightLineMarker)
session.removeMarker(session.$highlightLineMarker); session.removeMarker(session.$highlightLineMarker);
} if (typeof this.$lastrow == "number")
session.$highlightLineMarker = null; this.renderer.removeGutterDecoration(this.$lastrow, "ace_gutter_active_line");
if (this.getHighlightActiveLine() && (this.getSelectionStyle() != "line" || !this.selection.isMultiLine())) { session.$highlightLineMarker = null;
this.$lastrow = null;
if (this.getHighlightActiveLine()) {
var cursor = this.getCursorPosition(), var cursor = this.getCursorPosition(),
foldLine = this.session.getFoldLine(cursor.row); foldLine = this.session.getFoldLine(cursor.row);
var range;
if (foldLine) { if ((this.getSelectionStyle() != "line" || !this.selection.isMultiLine())) {
range = new Range(foldLine.start.row, 0, foldLine.end.row + 1, 0); var range;
} else { if (foldLine) {
range = new Range(cursor.row, 0, cursor.row+1, 0); range = new Range(foldLine.start.row, 0, foldLine.end.row + 1, 0);
} else {
range = new Range(cursor.row, 0, cursor.row+1, 0);
}
session.$highlightLineMarker = session.addMarker(range, "ace_active_line", "background");
} }
session.$highlightLineMarker = session.addMarker(range, "ace_active_line", "background");
this.renderer.addGutterDecoration(this.$lastrow = cursor.row, "ace_gutter_active_line");
} }
}; };
@ -12423,10 +12431,6 @@ var VirtualRenderer = function(container, theme) {
this.$gutter.className = "ace_gutter"; this.$gutter.className = "ace_gutter";
this.container.appendChild(this.$gutter); this.container.appendChild(this.$gutter);
this.$corner = dom.createElement("div");
this.$corner.className = "ace_corner";
this.container.appendChild(this.$corner);
this.scroller = dom.createElement("div"); this.scroller = dom.createElement("div");
this.scroller.className = "ace_scroller"; this.scroller.className = "ace_scroller";
this.container.appendChild(this.scroller); this.container.appendChild(this.scroller);
@ -13372,11 +13376,11 @@ var Gutter = function(parentEl) {
this.addGutterDecoration = function(row, className){ this.addGutterDecoration = function(row, className){
if (!this.$decorations[row]) if (!this.$decorations[row])
this.$decorations[row] = ""; this.$decorations[row] = "";
this.$decorations[row] += " ace_" + className; this.$decorations[row] += " " + className;
}; };
this.removeGutterDecoration = function(row, className){ this.removeGutterDecoration = function(row, className){
this.$decorations[row] = this.$decorations[row].replace(" ace_" + className, ""); this.$decorations[row] = this.$decorations[row].replace(" " + className, "");
}; };
this.setBreakpoints = function(rows) { this.setBreakpoints = function(rows) {
@ -14627,20 +14631,6 @@ __ace_shadowed__.define("text!ace/css/editor.css", [], "@import url(//fonts.goog
" z-index: 4;\n" + " z-index: 4;\n" +
"}\n" + "}\n" +
"\n" + "\n" +
".ace_corner{\n" +
" position : absolute;\n" +
" left : 41px;\n" +
" top : -5px;\n" +
" border-radius : 6px 0 0 0;\n" +
" border-color : #e8e8e8;\n" +
" border-width : 1px 0 0 1px;\n" +
" border-style : solid;\n" +
" box-shadow : 4px 4px 0px #e8e8e8 inset;\n" +
" width : 10px;\n" +
" height : 10px;\n" +
" z-index : 10000;\n" +
"}\n" +
"\n" +
".ace_gutter {\n" + ".ace_gutter {\n" +
" position: absolute;\n" + " position: absolute;\n" +
" overflow : hidden;\n" + " overflow : hidden;\n" +
@ -14788,6 +14778,10 @@ __ace_shadowed__.define("text!ace/css/editor.css", [], "@import url(//fonts.goog
" z-index: 2;\n" + " z-index: 2;\n" +
"}\n" + "}\n" +
"\n" + "\n" +
".ace_gutter .ace_gutter_active_line{\n" +
" background-color : #dcdcdc;\n" +
"}\n" +
"\n" +
".ace_marker-layer .ace_selected_word {\n" + ".ace_marker-layer .ace_selected_word {\n" +
" position: absolute;\n" + " position: absolute;\n" +
" z-index: 6;\n" + " z-index: 6;\n" +