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

jslint fixes

Browse source
This commit is contained in:
Fabian Jakobs 2011-09-06 18:15:17 +02:00
commit 6fdb285562
1 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

41
lib/ace/editor.js
View file

@ -382,7 +382,7 @@ var Editor =function(renderer, session) {
}; };
this.onChangeMode = function() { this.onChangeMode = function() {
this.renderer.updateText() this.renderer.updateText();
}; };
this.onChangeWrapLimit = function() { this.onChangeWrapLimit = function() {
@ -418,7 +418,7 @@ var Editor =function(renderer, session) {
this._emit("cut", range); this._emit("cut", range);
if (!this.selection.isEmpty()) { if (!this.selection.isEmpty()) {
this.session.remove(range) this.session.remove(range);
this.clearSelection(); this.clearSelection();
} }
}; };
@ -648,11 +648,11 @@ var Editor =function(renderer, session) {
this.$modeBehaviours = true; this.$modeBehaviours = true;
this.setBehavioursEnabled = function (enabled) { this.setBehavioursEnabled = function (enabled) {
this.$modeBehaviours = enabled; this.$modeBehaviours = enabled;
} };
this.getBehavioursEnabled = function () { this.getBehavioursEnabled = function () {
return this.$modeBehaviours; return this.$modeBehaviours;
} };
this.removeRight = function() { this.removeRight = function() {
if (this.$readOnly) if (this.$readOnly)
@ -661,7 +661,7 @@ var Editor =function(renderer, session) {
if (this.selection.isEmpty()) { if (this.selection.isEmpty()) {
this.selection.selectRight(); this.selection.selectRight();
} }
this.session.remove(this.getSelectionRange()) this.session.remove(this.getSelectionRange());
this.clearSelection(); this.clearSelection();
}; };
@ -760,17 +760,18 @@ var Editor =function(renderer, session) {
var cursor = this.getCursorPosition(); var cursor = this.getCursorPosition();
var column = cursor.column; var column = cursor.column;
if (column == 0) if (column === 0)
return; return;
var line = this.session.getLine(cursor.row); var line = this.session.getLine(cursor.row);
var swap, range;
if (column < line.length) { if (column < line.length) {
var swap = line.charAt(column) + line.charAt(column-1); swap = line.charAt(column) + line.charAt(column-1);
var range = new Range(cursor.row, column-1, cursor.row, column+1) range = new Range(cursor.row, column-1, cursor.row, column+1);
} }
else { else {
var swap = line.charAt(column-1) + line.charAt(column-2); swap = line.charAt(column-1) + line.charAt(column-2);
var range = new Range(cursor.row, column-2, cursor.row, column) range = new Range(cursor.row, column-2, cursor.row, column);
} }
this.session.replace(range, swap); this.session.replace(range, swap);
}; };
@ -814,7 +815,7 @@ var Editor =function(renderer, session) {
return; return;
var state = this.session.getState(this.getCursorPosition().row); 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); this.session.getMode().toggleCommentLines(state, this.session, rows.first, rows.last);
}; };
@ -823,10 +824,11 @@ var Editor =function(renderer, session) {
return; return;
var rows = this.$getSelectedRows(); var rows = this.$getSelectedRows();
var range;
if (rows.last == 0 || rows.last+1 < this.session.getLength()) 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 else
var range = new Range( range = new Range(
rows.first-1, this.session.getLine(rows.first-1).length, rows.first-1, this.session.getLine(rows.first-1).length,
rows.last, this.session.getLine(rows.last).length rows.last, this.session.getLine(rows.last).length
); );
@ -912,7 +914,6 @@ var Editor =function(renderer, session) {
this.renderer.hideComposition(); this.renderer.hideComposition();
}; };
this.getFirstVisibleRow = function() { this.getFirstVisibleRow = function() {
return this.renderer.getFirstVisibleRow(); return this.renderer.getFirstVisibleRow();
}; };
@ -1043,7 +1044,7 @@ var Editor =function(renderer, session) {
if (!this.isRowVisible(this.getCursorPosition().row)) { if (!this.isRowVisible(this.getCursorPosition().row)) {
this.scrollToLine(lineNumber, true); this.scrollToLine(lineNumber, true);
} }
}, };
this.navigateTo = function(row, column) { this.navigateTo = function(row, column) {
this.clearSelection(); this.clearSelection();
@ -1131,7 +1132,7 @@ var Editor =function(renderer, session) {
this.$tryReplace(range, replacement); this.$tryReplace(range, replacement);
if (range !== null) if (range !== null)
this.selection.setSelectionRange(range); this.selection.setSelectionRange(range);
}, };
this.replaceAll = function(replacement, options) { this.replaceAll = function(replacement, options) {
if (options) { if (options) {
@ -1152,11 +1153,11 @@ var Editor =function(renderer, session) {
this.selection.setSelectionRange(selection); this.selection.setSelectionRange(selection);
this.$blockScrolling -= 1; this.$blockScrolling -= 1;
}, };
this.$tryReplace = function(range, replacement) { this.$tryReplace = function(range, replacement) {
var input = this.session.getTextRange(range); var input = this.session.getTextRange(range);
var replacement = this.$search.replace(input, replacement); replacement = this.$search.replace(input, replacement);
if (replacement !== null) { if (replacement !== null) {
range.end = this.session.replace(range, replacement); range.end = this.session.replace(range, replacement);
return range; return range;
@ -1175,7 +1176,7 @@ var Editor =function(renderer, session) {
options.needle = needle; options.needle = needle;
this.$search.set(options); this.$search.set(options);
this.$find(); this.$find();
}, };
this.findNext = function(options) { this.findNext = function(options) {
options = options || {}; options = options || {};
@ -1218,7 +1219,7 @@ var Editor =function(renderer, session) {
this.destroy = function() { this.destroy = function() {
this.renderer.destroy(); this.renderer.destroy();
} };
}).call(Editor.prototype); }).call(Editor.prototype);