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

[incremental search] cleanup

Browse source
This commit is contained in:
Robert Krahn 2013-03-10 20:48:34 -07:00
commit 6141a63ba3
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/ace/incremental_search.js
View file

@ -199,11 +199,11 @@ require("./config").defineOptions(Editor.prototype, "editor", {
useIncrementalSearch: { useIncrementalSearch: {
set: function(val) { set: function(val) {
var iSearchCommands = require("ace/commands/incremental_search_commands").iSearchStartCommands; var iSearchCommands = require("ace/commands/incremental_search_commands").iSearchStartCommands;
var kbd = ace.getKeyboardHandler(); var kbd = this.getKeyboardHandler();
patchHighlightMarkerStyling({enable: val});
if (val) { if (val) {
// enable for whole editor // enable for whole editor
this.commands.addCommands(iSearchCommands); this.commands.addCommands(iSearchCommands);
patchHighlightMarkerStyling({enable: true});
if (kbd.isEmacs) { // adapt emacs key handler if used if (kbd.isEmacs) { // adapt emacs key handler if used
kbd.oldSearchBindings = { kbd.oldSearchBindings = {
'c-s': kbd.commmandKeyBinding['c-s'], 'c-s': kbd.commmandKeyBinding['c-s'],
@ -214,8 +214,7 @@ require("./config").defineOptions(Editor.prototype, "editor", {
} }
} else { } else {
this.commands.removeCommands(iSearchCommands); this.commands.removeCommands(iSearchCommands);
patchHighlightMarkerStyling({enable: false}); if (kbd.isEmacs && kbd.oldSearchBindings) {
if (kbd.isEmacs) {
kbd.bindKey('C-s', kbd.oldSearchBindings['c-s']); kbd.bindKey('C-s', kbd.oldSearchBindings['c-s']);
kbd.bindKey('C-r', kbd.oldSearchBindings['c-r']); kbd.bindKey('C-r', kbd.oldSearchBindings['c-r']);
} }