This commit is contained in:
Fabian Jakobs 2011-12-06 16:00:10 +01:00
commit 23a48b23b4
2 changed files with 18 additions and 18 deletions

View file

@ -106,7 +106,7 @@ var Document = function(text) {
case "auto": case "auto":
return this.$autoNewLine; return this.$autoNewLine;
} }
}, };
this.$autoNewLine = "\n"; this.$autoNewLine = "\n";
this.$newLineMode = "auto"; this.$newLineMode = "auto";
@ -169,7 +169,7 @@ var Document = function(text) {
position.column = this.getLine(length-1).length; position.column = this.getLine(length-1).length;
} }
return position; return position;
} };
this.insert = function(position, text) { this.insert = function(position, text) {
if (text.length == 0) if (text.length == 0)
@ -209,7 +209,7 @@ var Document = function(text) {
}; };
this._dispatchEvent("change", { data: delta }); this._dispatchEvent("change", { data: delta });
return range.end; return range.end;
}, };
this.insertNewLine = function(position) { this.insertNewLine = function(position) {
position = this.$clipPosition(position); position = this.$clipPosition(position);
@ -372,13 +372,13 @@ var Document = function(text) {
var range = Range.fromPoints(delta.range.start, delta.range.end); var range = Range.fromPoints(delta.range.start, delta.range.end);
if (delta.action == "insertLines") if (delta.action == "insertLines")
this.insertLines(range.start.row, delta.lines) this.insertLines(range.start.row, delta.lines);
else if (delta.action == "insertText") else if (delta.action == "insertText")
this.insert(range.start, delta.text) this.insert(range.start, delta.text);
else if (delta.action == "removeLines") else if (delta.action == "removeLines")
this.removeLines(range.start.row, range.end.row - 1) this.removeLines(range.start.row, range.end.row - 1);
else if (delta.action == "removeText") else if (delta.action == "removeText")
this.remove(range) this.remove(range);
} }
}; };
@ -389,13 +389,13 @@ var Document = function(text) {
var range = Range.fromPoints(delta.range.start, delta.range.end); var range = Range.fromPoints(delta.range.start, delta.range.end);
if (delta.action == "insertLines") if (delta.action == "insertLines")
this.removeLines(range.start.row, range.end.row - 1) this.removeLines(range.start.row, range.end.row - 1);
else if (delta.action == "insertText") else if (delta.action == "insertText")
this.remove(range) this.remove(range);
else if (delta.action == "removeLines") else if (delta.action == "removeLines")
this.insertLines(range.start.row, delta.lines) this.insertLines(range.start.row, delta.lines);
else if (delta.action == "removeText") else if (delta.action == "removeText")
this.insert(range.start, delta.text) this.insert(range.start, delta.text);
} }
}; };

View file

@ -988,10 +988,10 @@ var EditSession = function(text, mode) {
var useWrapMode = this.$useWrapMode; var useWrapMode = this.$useWrapMode;
var len; var len;
var action = e.data.action; var action = e.data.action;
var firstRow = e.data.range.start.row, var firstRow = e.data.range.start.row;
lastRow = e.data.range.end.row, var lastRow = e.data.range.end.row;
start = e.data.range.start, var start = e.data.range.start;
end = e.data.range.end; var end = e.data.range.end;
var removedFolds = null; var removedFolds = null;
if (action.indexOf("Lines") != -1) { if (action.indexOf("Lines") != -1) {
@ -1158,7 +1158,7 @@ var EditSession = function(text, mode) {
TAB = 11, TAB = 11,
TAB_SPACE = 12; TAB_SPACE = 12;
this.$computeWrapSplits = function(tokens, wrapLimit, tabSize) { this.$computeWrapSplits = function(tokens, wrapLimit) {
if (tokens.length == 0) { if (tokens.length == 0) {
return []; return [];
} }
@ -1175,11 +1175,11 @@ var EditSession = function(text, mode) {
var len = displayed.length; var len = displayed.length;
displayed.join(""). displayed.join("").
// Get all the TAB_SPACEs. // Get all the TAB_SPACEs.
replace(/12/g, function(m) { replace(/12/g, function() {
len -= 1; len -= 1;
}). }).
// Get all the CHAR_EXT/multipleWidth characters. // Get all the CHAR_EXT/multipleWidth characters.
replace(/2/g, function(m) { replace(/2/g, function() {
len -= 1; len -= 1;
}); });