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

using moveCursorTo in search.js isn't safe (triggers events)

Browse source
This commit is contained in:
nightwing 2011-10-21 20:48:26 +05:00
commit 245b27a4f7
1 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lib/ace/search.js
View file

@ -89,29 +89,27 @@ Search.SELECTION = 2;
}; };
this.findAll = function(session) { this.findAll = function(session) {
if (!this.$options.needle) var options = this.$options;
if (!options.needle)
return []; return [];
if (this.$options.backwards) { if (options.backwards) {
var iterator = this.$backwardMatchIterator(session); var iterator = this.$backwardMatchIterator(session);
} else { } else {
iterator = this.$forwardMatchIterator(session); iterator = this.$forwardMatchIterator(session);
} }
var ignoreCursorColumn = this.$options.wrap && this.$options.scope == Search.ALL; var ignoreCursor = !options.start && options.wrap && options.scope == Search.ALL;
var start = session.getSelection().getCursor(); if (ignoreCursor)
if (ignoreCursorColumn) { options.start = {row: 0, column: 0};
session.getSelection().moveCursorTo(0, 0);
}
var ranges = []; var ranges = [];
iterator.forEach(function(range) { iterator.forEach(function(range) {
ranges.push(range); ranges.push(range);
}); });
if (ignoreCursorColumn) { if (ignoreCursor)
session.getSelection().moveCursorTo(start.row, start.column) options.start = null;
}
return ranges; return ranges;
}; };
@ -223,8 +221,8 @@ Search.SELECTION = 2;
this.$forwardLineIterator = function(session) { this.$forwardLineIterator = function(session) {
var searchSelection = this.$options.scope == Search.SELECTION; var searchSelection = this.$options.scope == Search.SELECTION;
var range = session.getSelection().getRange(); var range = this.$options.range || session.getSelection().getRange();
var start = session.getSelection().getCursor(); var start = this.$options.start || session.getSelection().getCursor();
var firstRow = searchSelection ? range.start.row : 0; var firstRow = searchSelection ? range.start.row : 0;
var firstColumn = searchSelection ? range.start.column : 0; var firstColumn = searchSelection ? range.start.column : 0;
@ -285,8 +283,8 @@ Search.SELECTION = 2;
this.$backwardLineIterator = function(session) { this.$backwardLineIterator = function(session) {
var searchSelection = this.$options.scope == Search.SELECTION; var searchSelection = this.$options.scope == Search.SELECTION;
var range = session.getSelection().getRange(); var range = this.$options.range || session.getSelection().getRange();
var start = searchSelection ? range.end : range.start; var start = this.$options.start || session.getSelection().getCursor();
var firstRow = searchSelection ? range.start.row : 0; var firstRow = searchSelection ? range.start.row : 0;
var firstColumn = searchSelection ? range.start.column : 0; var firstColumn = searchSelection ? range.start.column : 0;