Merge pull request #6629 from adobe/tom/issue-6612

Fix issue #6612: Find in Files panel doesn't reset scroll...
adobe · Jan 30, 2014 · a01a58a · a01a58a
2 parents 9001a87 + 1c98d35
commit a01a58a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/search/FindInFiles.js b/src/search/FindInFiles.js
@@ -418,7 +418,6 @@ define(function (require, exports, module) {
             $searchContent
                 .empty()
                 .append(Mustache.render(searchResultsTemplate, {searchList: searchList, Strings: Strings}))
-                .scrollTop(0)        // Otherwise scroll pos from previous contents is remembered
                 .off(".searchList")  // Remove the old events
 
                 // Add the click event listener directly on the table parent
@@ -497,6 +496,7 @@ define(function (require, exports, module) {
                 $selectedRow = null;
             }
             searchResultsPanel.show();
+            $searchContent.scrollTop(0); // Otherwise scroll pos from previous contents is remembered
 
             if (dialog) {
                 dialog._close();

diff --git a/src/search/FindReplace.js b/src/search/FindReplace.js
@@ -587,6 +587,7 @@ define(function (require, exports, module) {
         });
 
         replaceAllPanel.show();
+        $replaceAllTable.scrollTop(0); // Otherwise scroll pos from previous contents is remembered
     }
 
     /** Shows the Find-Replace search bar at top */
-Original file line number
+Diff line change
@@ Expand Up / @@ -587,6 +587,7 @@ define(function (require, exports, module) { @@
             });
             replaceAllPanel.show();
+            $replaceAllTable.scrollTop(0); // Otherwise scroll pos from previous contents is remembered
         }
         /** Shows the Find-Replace search bar at top */
@@ Expand Down @@