tabs to spaces

This commit is contained in:
Fabian Jakobs 2012-05-01 11:48:45 +02:00
commit ac364fe0c5
97 changed files with 577 additions and 577 deletions

View file

@ -475,8 +475,8 @@ var Editor = function(renderer, session) {
session.$highlightLineMarker = null; session.$highlightLineMarker = null;
if (this.$highlightActiveLine) { if (this.$highlightActiveLine) {
var cursor = this.getCursorPosition(), var cursor = this.getCursorPosition();
foldLine = this.session.getFoldLine(cursor.row); var foldLine = this.session.getFoldLine(cursor.row);
if ((this.getSelectionStyle() != "line" || !this.selection.isMultiLine())) { if ((this.getSelectionStyle() != "line" || !this.selection.isMultiLine())) {
var range; var range;
@ -487,6 +487,7 @@ var Editor = function(renderer, session) {
} }
session.$highlightLineMarker = session.addMarker(range, "ace_active_line", "background"); session.$highlightLineMarker = session.addMarker(range, "ace_active_line", "background");
} }
}
}; };
/** internal, hide /** internal, hide

View file

@ -398,7 +398,6 @@ var Selection = function(session) {
return this.session.getWordRange(row, column); return this.session.getWordRange(row, column);
}; };
>>>>>>> ui/navbar
this.selectWord = function() { this.selectWord = function() {
this.setSelectionRange(this.getWordRange()); this.setSelectionRange(this.getWordRange());
}; };