Merge pull request #5793 from SAPlayer/find-in-files-focus

redmunds · redmunds · commit 70b2803b819d · 2013-11-03T08:46:24.000-08:00
Fix #5699: Set focus to input field when hitting Find In Files when it is already open
diff --git a/src/search/FindInFiles.js b/src/search/FindInFiles.js
@@ -810,6 +810,13 @@ define(function (require, exports, module) {
         var currentEditor = EditorManager.getActiveEditor(),
             initialString = currentEditor && currentEditor.getSelectedText();
 
+        if (dialog && !dialog.closed && dialog.hasOwnProperty("modalBar") && dialog.modalBar) {
+            // The modalBar was already up. When creating the new modalBar, copy the
+            // current query instead of using the passed-in selected text.
+            initialString = dialog.getDialogTextField().val();
+            dialog.modalBar.close(true, false);
+        }
+
         dialog             = new FindInFilesDialog();
         searchResults      = {};
         currentStart       = 0;
