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

[incremental search] disable other keyboard handlers

Browse source
This commit is contained in:
Robert Krahn 2013-03-10 12:53:59 -07:00
commit 35a0066965
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/ace/incremental_search.js
View file

@ -106,10 +106,12 @@ oop.inherits(IncrementalSearch, Search);
found = this.find(session); found = this.find(session);
if (found) { if (found) {
if (options.backwards) found = Range.fromPoints(found.end, found.start); if (options.backwards) found = Range.fromPoints(found.end, found.start);
session.highlight(options.re);
this.$editor.moveCursorToPosition(found.end); this.$editor.moveCursorToPosition(found.end);
this.$editor.renderer.updateBackMarkers(); // force highlight layer redraw
if (moveToNext) this.$currentPos = found.end; if (moveToNext) this.$currentPos = found.end;
// highlight after cursor move, so selection works properly
// also force highlight layer redraw
session.highlight(options.re);
this.$editor.renderer.updateBackMarkers();
} }
console.log("searching %s from [%s/%s]: %s", console.log("searching %s from [%s/%s]: %s",
options.backwards ? 'backwards' : 'forwards', options.backwards ? 'backwards' : 'forwards',
@ -155,7 +157,7 @@ oop.inherits(IncrementalSearch, Search);
iSearch.handleKeyboard = function(data, hashId, key, keyCode) { iSearch.handleKeyboard = function(data, hashId, key, keyCode) {
this.message("data: " + data + ", hashId: " + hashId + ", key: " + key + ", keyCode: " + keyCode); this.message("data: " + data + ", hashId: " + hashId + ", key: " + key + ", keyCode: " + keyCode);
var stop = {command: 'null'}, result = undefined; var stop = {command: 'null'}, result = stop;
console.log(this.$options.needle); console.log(this.$options.needle);
if (hashId === 0) { if (hashId === 0) {