From ef02ed7d80e8289c64755d110392d485759c2292 Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Thu, 12 Jun 2014 18:14:02 -0700 Subject: [PATCH 1/2] fix Replace in... unit tests --- test/spec/FindInFiles-test.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/spec/FindInFiles-test.js b/test/spec/FindInFiles-test.js index 20bce224329..30c2f11f93f 100644 --- a/test/spec/FindInFiles-test.js +++ b/test/spec/FindInFiles-test.js @@ -1394,8 +1394,8 @@ define(function (require, exports, module) { it("should do a search in folder, replace all from find bar", function () { openTestProjectCopy(defaultSourcePath); - var dirEntry = FileSystem.getDirectoryForPath(defaultSourcePath + "/css/"); - openSearchBar(null, true); + var dirEntry = FileSystem.getDirectoryForPath(testPath + "/css/"); + openSearchBar(dirEntry, true); executeReplace("foo", "bar", true); waitsFor(function () { @@ -1418,8 +1418,8 @@ define(function (require, exports, module) { it("should do a search in file, replace all from find bar", function () { openTestProjectCopy(defaultSourcePath); - var dirEntry = FileSystem.getDirectoryForPath(defaultSourcePath + "/css/foo.css"); - openSearchBar(null, true); + var fileEntry = FileSystem.getFileForPath(testPath + "/css/foo.css"); + openSearchBar(fileEntry, true); executeReplace("foo", "bar", true); waitsFor(function () { From 9a13326a1ed292b0e683f2051d86271a70a911ff Mon Sep 17 00:00:00 2001 From: Randy Edmunds Date: Thu, 12 Jun 2014 18:26:34 -0700 Subject: [PATCH 2/2] re-order commands --- src/search/FindInFilesUI.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/search/FindInFilesUI.js b/src/search/FindInFilesUI.js index 4a8da60714c..4054d5d3a89 100644 --- a/src/search/FindInFilesUI.js +++ b/src/search/FindInFilesUI.js @@ -385,10 +385,11 @@ define(function (require, exports, module) { // Initialize: command handlers CommandManager.register(Strings.CMD_FIND_IN_FILES, Commands.CMD_FIND_IN_FILES, _showFindBar); - CommandManager.register(Strings.CMD_REPLACE_IN_FILES, Commands.CMD_REPLACE_IN_FILES, _showReplaceBar); CommandManager.register(Strings.CMD_FIND_IN_SELECTED, Commands.CMD_FIND_IN_SELECTED, _showFindBarForSubtree); - CommandManager.register(Strings.CMD_REPLACE_IN_SELECTED, Commands.CMD_REPLACE_IN_SELECTED, _showReplaceBarForSubtree); CommandManager.register(Strings.CMD_FIND_IN_SUBTREE, Commands.CMD_FIND_IN_SUBTREE, _showFindBarForSubtree); + + CommandManager.register(Strings.CMD_REPLACE_IN_FILES, Commands.CMD_REPLACE_IN_FILES, _showReplaceBar); + CommandManager.register(Strings.CMD_REPLACE_IN_SELECTED, Commands.CMD_REPLACE_IN_SELECTED, _showReplaceBarForSubtree); CommandManager.register(Strings.CMD_REPLACE_IN_SUBTREE, Commands.CMD_REPLACE_IN_SUBTREE, _showReplaceBarForSubtree); // Public exports