This commit is contained in:
Fabian Jakobs 2011-09-07 10:48:12 +02:00
commit f6322a8296
6 changed files with 72 additions and 201 deletions

View file

@ -7326,7 +7326,7 @@ var Editor =function(renderer, session) {
};
this.onChangeMode = function() {
this.renderer.updateText()
this.renderer.updateText();
};
this.onChangeWrapLimit = function() {
@ -7362,7 +7362,7 @@ var Editor =function(renderer, session) {
this._emit("cut", range);
if (!this.selection.isEmpty()) {
this.session.remove(range)
this.session.remove(range);
this.clearSelection();
}
};
@ -7592,11 +7592,11 @@ var Editor =function(renderer, session) {
this.$modeBehaviours = true;
this.setBehavioursEnabled = function (enabled) {
this.$modeBehaviours = enabled;
}
};
this.getBehavioursEnabled = function () {
return this.$modeBehaviours;
}
};
this.removeRight = function() {
if (this.$readOnly)
@ -7605,7 +7605,7 @@ var Editor =function(renderer, session) {
if (this.selection.isEmpty()) {
this.selection.selectRight();
}
this.session.remove(this.getSelectionRange())
this.session.remove(this.getSelectionRange());
this.clearSelection();
};
@ -7704,17 +7704,18 @@ var Editor =function(renderer, session) {
var cursor = this.getCursorPosition();
var column = cursor.column;
if (column == 0)
if (column === 0)
return;
var line = this.session.getLine(cursor.row);
var swap, range;
if (column < line.length) {
var swap = line.charAt(column) + line.charAt(column-1);
var range = new Range(cursor.row, column-1, cursor.row, column+1)
swap = line.charAt(column) + line.charAt(column-1);
range = new Range(cursor.row, column-1, cursor.row, column+1);
}
else {
var swap = line.charAt(column-1) + line.charAt(column-2);
var range = new Range(cursor.row, column-2, cursor.row, column)
swap = line.charAt(column-1) + line.charAt(column-2);
range = new Range(cursor.row, column-2, cursor.row, column);
}
this.session.replace(range, swap);
};
@ -7758,7 +7759,7 @@ var Editor =function(renderer, session) {
return;
var state = this.session.getState(this.getCursorPosition().row);
var rows = this.$getSelectedRows()
var rows = this.$getSelectedRows();
this.session.getMode().toggleCommentLines(state, this.session, rows.first, rows.last);
};
@ -7767,10 +7768,11 @@ var Editor =function(renderer, session) {
return;
var rows = this.$getSelectedRows();
var range;
if (rows.last == 0 || rows.last+1 < this.session.getLength())
var range = new Range(rows.first, 0, rows.last+1, 0)
range = new Range(rows.first, 0, rows.last+1, 0);
else
var range = new Range(
range = new Range(
rows.first-1, this.session.getLine(rows.first-1).length,
rows.last, this.session.getLine(rows.last).length
);
@ -7856,7 +7858,6 @@ var Editor =function(renderer, session) {
this.renderer.hideComposition();
};
this.getFirstVisibleRow = function() {
return this.renderer.getFirstVisibleRow();
};
@ -7987,7 +7988,7 @@ var Editor =function(renderer, session) {
if (!this.isRowVisible(this.getCursorPosition().row)) {
this.scrollToLine(lineNumber, true);
}
},
};
this.navigateTo = function(row, column) {
this.clearSelection();
@ -8075,7 +8076,7 @@ var Editor =function(renderer, session) {
this.$tryReplace(range, replacement);
if (range !== null)
this.selection.setSelectionRange(range);
},
};
this.replaceAll = function(replacement, options) {
if (options) {
@ -8096,11 +8097,11 @@ var Editor =function(renderer, session) {
this.selection.setSelectionRange(selection);
this.$blockScrolling -= 1;
},
};
this.$tryReplace = function(range, replacement) {
var input = this.session.getTextRange(range);
var replacement = this.$search.replace(input, replacement);
replacement = this.$search.replace(input, replacement);
if (replacement !== null) {
range.end = this.session.replace(range, replacement);
return range;
@ -8119,7 +8120,7 @@ var Editor =function(renderer, session) {
options.needle = needle;
this.$search.set(options);
this.$find();
},
};
this.findNext = function(options) {
options = options || {};
@ -8162,7 +8163,7 @@ var Editor =function(renderer, session) {
this.destroy = function() {
this.renderer.destroy();
}
};
}).call(Editor.prototype);
@ -26381,7 +26382,7 @@ define("text!demo/docs/textile.textile", [], "h1. Textile document\n" +
"bg. Blockquote!\n" +
" This is a two-list blockquote..!");
define("text!ace/css/editor.css", [], "@import url(http://fonts.googleapis.com/css?family=Droid+Sans+Mono);\n" +
define("text!ace/css/editor.css", [], "@import url(//fonts.googleapis.com/css?family=Droid+Sans+Mono);\n" +
"\n" +
"\n" +
".ace_editor {\n" +
@ -26878,50 +26879,6 @@ define("text!demo/styles.css", [], "html {\n" +
" text-align: left;\n" +
"}");
define("text!deps/csslint/demos/demo.css", [], "@charset \"UTF-8\";\n" +
"\n" +
"@import url(\"booya.css\") print,screen;\n" +
"@import \"whatup.css\" screen;\n" +
"@import \"wicked.css\";\n" +
"\n" +
"@namespace \"http://www.w3.org/1999/xhtml\";\n" +
"@namespace svg \"http://www.w3.org/2000/svg\";\n" +
"\n" +
"li.inline #foo {\n" +
" background: url(\"something.png\");\n" +
" display: inline;\n" +
" padding-left: 3px;\n" +
" padding-right: 7px;\n" +
" border-right: 1px dotted #066;\n" +
"}\n" +
"\n" +
"li.last.first {\n" +
" display: inline;\n" +
" padding-left: 3px !important;\n" +
" padding-right: 3px;\n" +
" border-right: 0px;\n" +
"}\n" +
"\n" +
"@media print {\n" +
" li.inline {\n" +
" color: black;\n" +
" }\n" +
"\n" +
"\n" +
"@charset \"UTF-8\"; \n" +
"\n" +
"@page {\n" +
" margin: 10%;\n" +
" counter-increment: page;\n" +
"\n" +
" @top-center {\n" +
" font-family: sans-serif;\n" +
" font-weight: bold;\n" +
" font-size: 2em;\n" +
" content: counter(page);\n" +
" }\n" +
"}");
define("text!doc/site/iphone.css", [], "#wrapper {\n" +
" position:relative;\n" +
" overflow:hidden;\n" +
@ -27181,7 +27138,7 @@ define("text!doc/site/style.css", [], "body {\n" +
"\n" +
"");
define("text!lib/ace/css/editor.css", [], "@import url(http://fonts.googleapis.com/css?family=Droid+Sans+Mono);\n" +
define("text!lib/ace/css/editor.css", [], "@import url(//fonts.googleapis.com/css?family=Droid+Sans+Mono);\n" +
"\n" +
"\n" +
".ace_editor {\n" +

File diff suppressed because one or more lines are too long

View file

@ -6055,7 +6055,7 @@ var Editor =function(renderer, session) {
};
this.onChangeMode = function() {
this.renderer.updateText()
this.renderer.updateText();
};
this.onChangeWrapLimit = function() {
@ -6091,7 +6091,7 @@ var Editor =function(renderer, session) {
this._emit("cut", range);
if (!this.selection.isEmpty()) {
this.session.remove(range)
this.session.remove(range);
this.clearSelection();
}
};
@ -6321,11 +6321,11 @@ var Editor =function(renderer, session) {
this.$modeBehaviours = true;
this.setBehavioursEnabled = function (enabled) {
this.$modeBehaviours = enabled;
}
};
this.getBehavioursEnabled = function () {
return this.$modeBehaviours;
}
};
this.removeRight = function() {
if (this.$readOnly)
@ -6334,7 +6334,7 @@ var Editor =function(renderer, session) {
if (this.selection.isEmpty()) {
this.selection.selectRight();
}
this.session.remove(this.getSelectionRange())
this.session.remove(this.getSelectionRange());
this.clearSelection();
};
@ -6433,17 +6433,18 @@ var Editor =function(renderer, session) {
var cursor = this.getCursorPosition();
var column = cursor.column;
if (column == 0)
if (column === 0)
return;
var line = this.session.getLine(cursor.row);
var swap, range;
if (column < line.length) {
var swap = line.charAt(column) + line.charAt(column-1);
var range = new Range(cursor.row, column-1, cursor.row, column+1)
swap = line.charAt(column) + line.charAt(column-1);
range = new Range(cursor.row, column-1, cursor.row, column+1);
}
else {
var swap = line.charAt(column-1) + line.charAt(column-2);
var range = new Range(cursor.row, column-2, cursor.row, column)
swap = line.charAt(column-1) + line.charAt(column-2);
range = new Range(cursor.row, column-2, cursor.row, column);
}
this.session.replace(range, swap);
};
@ -6487,7 +6488,7 @@ var Editor =function(renderer, session) {
return;
var state = this.session.getState(this.getCursorPosition().row);
var rows = this.$getSelectedRows()
var rows = this.$getSelectedRows();
this.session.getMode().toggleCommentLines(state, this.session, rows.first, rows.last);
};
@ -6496,10 +6497,11 @@ var Editor =function(renderer, session) {
return;
var rows = this.$getSelectedRows();
var range;
if (rows.last == 0 || rows.last+1 < this.session.getLength())
var range = new Range(rows.first, 0, rows.last+1, 0)
range = new Range(rows.first, 0, rows.last+1, 0);
else
var range = new Range(
range = new Range(
rows.first-1, this.session.getLine(rows.first-1).length,
rows.last, this.session.getLine(rows.last).length
);
@ -6585,7 +6587,6 @@ var Editor =function(renderer, session) {
this.renderer.hideComposition();
};
this.getFirstVisibleRow = function() {
return this.renderer.getFirstVisibleRow();
};
@ -6716,7 +6717,7 @@ var Editor =function(renderer, session) {
if (!this.isRowVisible(this.getCursorPosition().row)) {
this.scrollToLine(lineNumber, true);
}
},
};
this.navigateTo = function(row, column) {
this.clearSelection();
@ -6804,7 +6805,7 @@ var Editor =function(renderer, session) {
this.$tryReplace(range, replacement);
if (range !== null)
this.selection.setSelectionRange(range);
},
};
this.replaceAll = function(replacement, options) {
if (options) {
@ -6825,11 +6826,11 @@ var Editor =function(renderer, session) {
this.selection.setSelectionRange(selection);
this.$blockScrolling -= 1;
},
};
this.$tryReplace = function(range, replacement) {
var input = this.session.getTextRange(range);
var replacement = this.$search.replace(input, replacement);
replacement = this.$search.replace(input, replacement);
if (replacement !== null) {
range.end = this.session.replace(range, replacement);
return range;
@ -6848,7 +6849,7 @@ var Editor =function(renderer, session) {
options.needle = needle;
this.$search.set(options);
this.$find();
},
};
this.findNext = function(options) {
options = options || {};
@ -6891,7 +6892,7 @@ var Editor =function(renderer, session) {
this.destroy = function() {
this.renderer.destroy();
}
};
}).call(Editor.prototype);
@ -15693,7 +15694,7 @@ exports.create = create;
});
define("text!ace/css/editor.css", [], "@import url(http://fonts.googleapis.com/css?family=Droid+Sans+Mono);\n" +
define("text!ace/css/editor.css", [], "@import url(//fonts.googleapis.com/css?family=Droid+Sans+Mono);\n" +
"\n" +
"\n" +
".ace_editor {\n" +
@ -16190,50 +16191,6 @@ define("text!demo/styles.css", [], "html {\n" +
" text-align: left;\n" +
"}");
define("text!deps/csslint/demos/demo.css", [], "@charset \"UTF-8\";\n" +
"\n" +
"@import url(\"booya.css\") print,screen;\n" +
"@import \"whatup.css\" screen;\n" +
"@import \"wicked.css\";\n" +
"\n" +
"@namespace \"http://www.w3.org/1999/xhtml\";\n" +
"@namespace svg \"http://www.w3.org/2000/svg\";\n" +
"\n" +
"li.inline #foo {\n" +
" background: url(\"something.png\");\n" +
" display: inline;\n" +
" padding-left: 3px;\n" +
" padding-right: 7px;\n" +
" border-right: 1px dotted #066;\n" +
"}\n" +
"\n" +
"li.last.first {\n" +
" display: inline;\n" +
" padding-left: 3px !important;\n" +
" padding-right: 3px;\n" +
" border-right: 0px;\n" +
"}\n" +
"\n" +
"@media print {\n" +
" li.inline {\n" +
" color: black;\n" +
" }\n" +
"\n" +
"\n" +
"@charset \"UTF-8\"; \n" +
"\n" +
"@page {\n" +
" margin: 10%;\n" +
" counter-increment: page;\n" +
"\n" +
" @top-center {\n" +
" font-family: sans-serif;\n" +
" font-weight: bold;\n" +
" font-size: 2em;\n" +
" content: counter(page);\n" +
" }\n" +
"}");
define("text!doc/site/iphone.css", [], "#wrapper {\n" +
" position:relative;\n" +
" overflow:hidden;\n" +
@ -16493,7 +16450,7 @@ define("text!doc/site/style.css", [], "body {\n" +
"\n" +
"");
define("text!lib/ace/css/editor.css", [], "@import url(http://fonts.googleapis.com/css?family=Droid+Sans+Mono);\n" +
define("text!lib/ace/css/editor.css", [], "@import url(//fonts.googleapis.com/css?family=Droid+Sans+Mono);\n" +
"\n" +
"\n" +
".ace_editor {\n" +

File diff suppressed because one or more lines are too long

View file

@ -6047,7 +6047,7 @@ var Editor =function(renderer, session) {
};
this.onChangeMode = function() {
this.renderer.updateText()
this.renderer.updateText();
};
this.onChangeWrapLimit = function() {
@ -6083,7 +6083,7 @@ var Editor =function(renderer, session) {
this._emit("cut", range);
if (!this.selection.isEmpty()) {
this.session.remove(range)
this.session.remove(range);
this.clearSelection();
}
};
@ -6313,11 +6313,11 @@ var Editor =function(renderer, session) {
this.$modeBehaviours = true;
this.setBehavioursEnabled = function (enabled) {
this.$modeBehaviours = enabled;
}
};
this.getBehavioursEnabled = function () {
return this.$modeBehaviours;
}
};
this.removeRight = function() {
if (this.$readOnly)
@ -6326,7 +6326,7 @@ var Editor =function(renderer, session) {
if (this.selection.isEmpty()) {
this.selection.selectRight();
}
this.session.remove(this.getSelectionRange())
this.session.remove(this.getSelectionRange());
this.clearSelection();
};
@ -6425,17 +6425,18 @@ var Editor =function(renderer, session) {
var cursor = this.getCursorPosition();
var column = cursor.column;
if (column == 0)
if (column === 0)
return;
var line = this.session.getLine(cursor.row);
var swap, range;
if (column < line.length) {
var swap = line.charAt(column) + line.charAt(column-1);
var range = new Range(cursor.row, column-1, cursor.row, column+1)
swap = line.charAt(column) + line.charAt(column-1);
range = new Range(cursor.row, column-1, cursor.row, column+1);
}
else {
var swap = line.charAt(column-1) + line.charAt(column-2);
var range = new Range(cursor.row, column-2, cursor.row, column)
swap = line.charAt(column-1) + line.charAt(column-2);
range = new Range(cursor.row, column-2, cursor.row, column);
}
this.session.replace(range, swap);
};
@ -6479,7 +6480,7 @@ var Editor =function(renderer, session) {
return;
var state = this.session.getState(this.getCursorPosition().row);
var rows = this.$getSelectedRows()
var rows = this.$getSelectedRows();
this.session.getMode().toggleCommentLines(state, this.session, rows.first, rows.last);
};
@ -6488,10 +6489,11 @@ var Editor =function(renderer, session) {
return;
var rows = this.$getSelectedRows();
var range;
if (rows.last == 0 || rows.last+1 < this.session.getLength())
var range = new Range(rows.first, 0, rows.last+1, 0)
range = new Range(rows.first, 0, rows.last+1, 0);
else
var range = new Range(
range = new Range(
rows.first-1, this.session.getLine(rows.first-1).length,
rows.last, this.session.getLine(rows.last).length
);
@ -6577,7 +6579,6 @@ var Editor =function(renderer, session) {
this.renderer.hideComposition();
};
this.getFirstVisibleRow = function() {
return this.renderer.getFirstVisibleRow();
};
@ -6708,7 +6709,7 @@ var Editor =function(renderer, session) {
if (!this.isRowVisible(this.getCursorPosition().row)) {
this.scrollToLine(lineNumber, true);
}
},
};
this.navigateTo = function(row, column) {
this.clearSelection();
@ -6796,7 +6797,7 @@ var Editor =function(renderer, session) {
this.$tryReplace(range, replacement);
if (range !== null)
this.selection.setSelectionRange(range);
},
};
this.replaceAll = function(replacement, options) {
if (options) {
@ -6817,11 +6818,11 @@ var Editor =function(renderer, session) {
this.selection.setSelectionRange(selection);
this.$blockScrolling -= 1;
},
};
this.$tryReplace = function(range, replacement) {
var input = this.session.getTextRange(range);
var replacement = this.$search.replace(input, replacement);
replacement = this.$search.replace(input, replacement);
if (replacement !== null) {
range.end = this.session.replace(range, replacement);
return range;
@ -6840,7 +6841,7 @@ var Editor =function(renderer, session) {
options.needle = needle;
this.$search.set(options);
this.$find();
},
};
this.findNext = function(options) {
options = options || {};
@ -6883,7 +6884,7 @@ var Editor =function(renderer, session) {
this.destroy = function() {
this.renderer.destroy();
}
};
}).call(Editor.prototype);
@ -15685,7 +15686,7 @@ exports.create = create;
});
__ace_shadowed__.define("text!ace/css/editor.css", [], "@import url(http://fonts.googleapis.com/css?family=Droid+Sans+Mono);\n" +
__ace_shadowed__.define("text!ace/css/editor.css", [], "@import url(//fonts.googleapis.com/css?family=Droid+Sans+Mono);\n" +
"\n" +
"\n" +
".ace_editor {\n" +
@ -16414,50 +16415,6 @@ __ace_shadowed__.define("text!demo/styles.css", [], "html {\n" +
" text-align: left;\n" +
"}");
__ace_shadowed__.define("text!deps/csslint/demos/demo.css", [], "@charset \"UTF-8\";\n" +
"\n" +
"@import url(\"booya.css\") print,screen;\n" +
"@import \"whatup.css\" screen;\n" +
"@import \"wicked.css\";\n" +
"\n" +
"@namespace \"http://www.w3.org/1999/xhtml\";\n" +
"@namespace svg \"http://www.w3.org/2000/svg\";\n" +
"\n" +
"li.inline #foo {\n" +
" background: url(\"something.png\");\n" +
" display: inline;\n" +
" padding-left: 3px;\n" +
" padding-right: 7px;\n" +
" border-right: 1px dotted #066;\n" +
"}\n" +
"\n" +
"li.last.first {\n" +
" display: inline;\n" +
" padding-left: 3px !important;\n" +
" padding-right: 3px;\n" +
" border-right: 0px;\n" +
"}\n" +
"\n" +
"@media print {\n" +
" li.inline {\n" +
" color: black;\n" +
" }\n" +
"\n" +
"\n" +
"@charset \"UTF-8\"; \n" +
"\n" +
"@page {\n" +
" margin: 10%;\n" +
" counter-increment: page;\n" +
"\n" +
" @top-center {\n" +
" font-family: sans-serif;\n" +
" font-weight: bold;\n" +
" font-size: 2em;\n" +
" content: counter(page);\n" +
" }\n" +
"}");
__ace_shadowed__.define("text!doc/site/iphone.css", [], "#wrapper {\n" +
" position:relative;\n" +
" overflow:hidden;\n" +
@ -16717,7 +16674,7 @@ __ace_shadowed__.define("text!doc/site/style.css", [], "body {\n" +
"\n" +
"");
__ace_shadowed__.define("text!lib/ace/css/editor.css", [], "@import url(http://fonts.googleapis.com/css?family=Droid+Sans+Mono);\n" +
__ace_shadowed__.define("text!lib/ace/css/editor.css", [], "@import url(//fonts.googleapis.com/css?family=Droid+Sans+Mono);\n" +
"\n" +
"\n" +
".ace_editor {\n" +

File diff suppressed because one or more lines are too long