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

[incremental search] cleanup && fixing module dependencies

Browse source
This commit is contained in:
Robert Krahn 2013-03-17 04:59:18 -07:00
commit e5fc2ea853
2 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

44
lib/ace/incremental_search.js
View file

@ -210,30 +210,32 @@ function patchHighlightMarkerStyling(options) {
// support for default keyboard handler
var CommandManager = require("./commands/command_manager").CommandManager;
(function() {
this.setupIncrementalSearch = function(editor, val) {
if (this.usesIncrementalSearch == val) return;
this.usesIncrementalSearch = val;
var iSearchCommands = iSearchCommandModule.iSearchStartCommands,
method = val ? 'addCommands' : 'removeCommands';
this[method](iSearchCommands);
};
}).call(CommandManager.prototype);
require(["./commands/command_manager"], function(cmdMgr) {
(function() {
this.setupIncrementalSearch = function(editor, val) {
if (this.usesIncrementalSearch == val) return;
this.usesIncrementalSearch = val;
var iSearchCommands = iSearchCommandModule.iSearchStartCommands,
method = val ? 'addCommands' : 'removeCommands';
this[method](iSearchCommands);
};
}).call(cmdMgr.CommandManager.prototype);
});
// support for emacskeyboard handler
var emacs = require("./keyboard/emacs");
emacs.handler.setupIncrementalSearch = function(editor, val) {
if (this.usesIncrementalSearch == val) return;
this.usesIncrementalSearch = val;
if (val) {
this.bindKey('C-s', 'iSearch');
this.bindKey('C-r', 'iSearchBackwards');
} else {
this.bindKey('C-s', "findnext");
this.bindKey('C-r', "findprevious");
require(["./keyboard/emacs"], function(emacs) {
emacs.handler.setupIncrementalSearch = function(editor, val) {
if (this.usesIncrementalSearch == val) return;
this.usesIncrementalSearch = val;
if (val) {
this.bindKey('C-s', 'iSearch');
this.bindKey('C-r', 'iSearchBackwards');
} else {
this.bindKey('C-s', "findnext");
this.bindKey('C-r', "findprevious");
}
}
}
});
// incremental search config option
var Editor = require("./editor").Editor;

2
lib/ace/test/all_browser.js
View file

@ -21,6 +21,7 @@ var testNames = [
"ace/editor_navigation_test",
"ace/editor_text_edit_test",
"ace/ext/static_highlight_test",
"ace/incremental_search_test",
"ace/keyboard/emacs_test",
"ace/keyboard/keybinding_test",
"ace/layer/text_test",
@ -45,7 +46,6 @@ var testNames = [
"ace/range_test",
"ace/range_list_test",
"ace/search_test",
"ace/incremental_search_test",
"ace/selection_test",
"ace/token_iterator_test",
"ace/virtual_renderer_test"