From 683d7693d22ce1f0fe3acf5562bc5af0633da796 Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org" <scott%scott-macgregor.org>
Date: Tue, 2 Nov 2004 02:03:09 +0000
Subject: [PATCH] Bug #267243 --> After doing a quick search, if you quickly
 load another folder, we don't hide the clear button all of the time.

Also fixes problems with the quick search bar when moving from a virtual folder to a non virtual folder.
---
 mail/base/content/commandglue.js | 5 ++---
 mail/base/content/searchBar.js   | 8 ++++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/mail/base/content/commandglue.js b/mail/base/content/commandglue.js
index 5fb37d97f1ba..658209aa70fa 100644
--- a/mail/base/content/commandglue.js
+++ b/mail/base/content/commandglue.js
@@ -897,9 +897,8 @@ function FolderPaneSelectionChange()
                 gPreQuickSearchView.close();
                 gPreQuickSearchView = null;  
               }
-              var searchInput = document.getElementById("searchInput");  //reset the search input on folder switch
-              if (searchInput) 
-                searchInput.value = "";
+              
+              clearQuickSearchAfterFolderChange();
             }
             ClearMessagePane();
 
diff --git a/mail/base/content/searchBar.js b/mail/base/content/searchBar.js
index a76a6c79f153..64c1b484a33f 100644
--- a/mail/base/content/searchBar.js
+++ b/mail/base/content/searchBar.js
@@ -108,6 +108,7 @@ var gSearchNotificationListener =
         gStatusBar.setAttribute("mode","normal");
         gSearchInProgress = false;
         viewDebug("gSearchInput = " + gSearchInput.value + "\n");
+
         // ### TODO need to find out if there's quick search within a virtual folder.
         if (gCurrentVirtualFolderUri &&
          (gSearchInput.value == "" || gSearchInput.showingSearchCriteria))
@@ -587,6 +588,13 @@ function ClearQSIfNecessary()
   Search("");
 }
 
+// called after the user switches folders while inside
+// of a quick search view...
+function clearQuickSearchAfterFolderChange()
+{
+  gSearchInput.setSearchCriteriaText();
+}
+
 function Search(str)
 {
   viewDebug("in Search str = " + str + "gSearchInput.showingSearchCriteria = " + gSearchInput.showingSearchCriteria + "\n");