From d51c906f3ef81a38c69201457549cdf7374a7809 Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Thu, 16 Aug 2012 17:55:54 -0700 Subject: [PATCH 1/3] don't need to define these as extra keys --- src/editor/EditorManager.js | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/src/editor/EditorManager.js b/src/editor/EditorManager.js index e52454b4f70..ac964157ff2 100644 --- a/src/editor/EditorManager.js +++ b/src/editor/EditorManager.js @@ -108,26 +108,7 @@ define(function (require, exports, module) { function _createEditorForDocument(doc, makeMasterEditor, container, range, additionalKeys) { var mode = EditorUtils.getModeFromFileExtension(doc.file.fullPath); - var extraKeys = { - "Ctrl-F" : function () { - // No-op, handled in FindReplace.js - }, - "Cmd-F" : function () { - // No-op, handled in FindReplace.js - }, - "Ctrl-H": function () { - // No-op, handled in FindReplace.js - }, - "Cmd-Alt-F": function () { - // No-op, handled in FindReplace.js - }, - "Shift-Ctrl-F": function () { - // No-op, handled in FindInFiles.js - }, - "Shift-Cmd-F" : function () { - // No-op, handled in FindInFiles.js - } - }; + var extraKeys = {}; if (additionalKeys) { mergeExtraKeys(null, extraKeys, additionalKeys); From 7600d7cc7f3ebc3b7d464c4bb42458e0d9f2f3eb Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Fri, 17 Aug 2012 08:48:18 -0700 Subject: [PATCH 2/3] backout localization of css class --- src/nls/strings.js | 1 - src/search/FindReplace.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/nls/strings.js b/src/nls/strings.js index 2459c58da8d..7382be2ac5a 100644 --- a/src/nls/strings.js +++ b/src/nls/strings.js @@ -108,7 +108,6 @@ define(function (require, exports, module) { // Find, Replace, Find in Files exports.SEARCH_REGEXP_INFO = "Use /re/ syntax for regexp search"; exports.WITH = "With"; - exports.SEARCHING = "Searching"; exports.BUTTON_YES = "Yes"; exports.BUTTON_NO = "No"; exports.BUTTON_STOP = "Stop"; diff --git a/src/search/FindReplace.js b/src/search/FindReplace.js index 2feea3f7013..93daa4c5f77 100644 --- a/src/search/FindReplace.js +++ b/src/search/FindReplace.js @@ -120,7 +120,7 @@ define(function (require, exports, module) { if (cm.lineCount() < 2000) { // This is too expensive on big documents. var cursor = getSearchCursor(cm, query); while (cursor.findNext()) { - state.marked.push(cm.markText(cursor.from(), cursor.to(), Strings.SEARCHING)); + state.marked.push(cm.markText(cursor.from(), cursor.to(), "CodeMirror-searching")); } } state.posFrom = state.posTo = cm.getCursor(); From e51ae22502220baeffed635a4413fd768b84bec2 Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Fri, 17 Aug 2012 08:59:33 -0700 Subject: [PATCH 3/3] more extrakey cleanup --- src/editor/EditorManager.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/editor/EditorManager.js b/src/editor/EditorManager.js index ac964157ff2..edf35168349 100644 --- a/src/editor/EditorManager.js +++ b/src/editor/EditorManager.js @@ -108,13 +108,7 @@ define(function (require, exports, module) { function _createEditorForDocument(doc, makeMasterEditor, container, range, additionalKeys) { var mode = EditorUtils.getModeFromFileExtension(doc.file.fullPath); - var extraKeys = {}; - - if (additionalKeys) { - mergeExtraKeys(null, extraKeys, additionalKeys); - } - - return new Editor(doc, makeMasterEditor, mode, container, extraKeys, range); + return new Editor(doc, makeMasterEditor, mode, container, additionalKeys, range); } /**