diff --git a/mail/base/content/commandglue.js b/mail/base/content/commandglue.js index 9e3c03db956..55a2c5e980b 100644 --- a/mail/base/content/commandglue.js +++ b/mail/base/content/commandglue.js @@ -807,7 +807,6 @@ function FolderPaneSelectionChange() gVirtualFolderTerms = null; gXFVirtualFolderTerms = null; gPrevFolderFlags = folderFlags; -// gSearchInput.showingSearchCriteria = false; gCurrentVirtualFolderUri = null; // don't get the db if this folder is a server // we're going to be display account central @@ -840,7 +839,6 @@ function FolderPaneSelectionChange() viewType = nsMsgViewType.eShowVirtualFolderResults; gXFVirtualFolderTerms = CreateGroupedSearchTerms(tempFilter.searchTerms); setupXFVirtualFolderSearch(srchFolderUriArray, gXFVirtualFolderTerms, searchOnline); - gSearchInput.showingSearchCriteria = false; // need to set things up so that reroot folder issues the search } else @@ -852,10 +850,7 @@ function FolderPaneSelectionChange() var realFolderRes = GetResourceFromUri(uriToLoad); var realFolder = realFolderRes.QueryInterface(Components.interfaces.nsIMsgFolder); msgDatabase = realFolder.getMsgDatabase(msgWindow); -// dump("search term string = " + searchTermString + "\n"); - gVirtualFolderTerms = CreateGroupedSearchTerms(tempFilter.searchTerms); - gSearchInput.showingSearchCriteria = false; } } else diff --git a/mail/base/content/msgMail3PaneWindow.js b/mail/base/content/msgMail3PaneWindow.js index 3131961747c..a05611ef24b 100644 --- a/mail/base/content/msgMail3PaneWindow.js +++ b/mail/base/content/msgMail3PaneWindow.js @@ -256,7 +256,7 @@ var folderListener = { { gDefaultSearchViewTerms = null; viewDebug("searching gVirtualFolderTerms\n"); - onClearSearch(); // clear quick search bar + loadVirtualFolder(); } else if (gMsgFolderSelected.flags & MSG_FOLDER_FLAG_VIRTUAL) { @@ -266,7 +266,7 @@ var folderListener = { else if (gDefaultSearchViewTerms) { viewDebug("searching gDefaultSearchViewTerms and rerootingFolder\n"); - onClearSearch(); + Search(""); } else { diff --git a/mail/base/content/searchBar.js b/mail/base/content/searchBar.js index 390e4a130e8..381ca8e3be7 100644 --- a/mail/base/content/searchBar.js +++ b/mail/base/content/searchBar.js @@ -635,6 +635,14 @@ function Search(str) onSearchInput(true); } +// When the front end has finished loading a virtual folder, it calls openVirtualFolder +// to actually perform the folder search. We use this method instead of calling Search("") directly +// from FolderLoaded in order to avoid moving focus into the search bar. +function loadVirtualFolder() +{ + onEnterInSearchBar(); +} + // this notification gets generated from layout when it finishes laying out a message // in the message pane. function onQuickSearchNewMsgLoaded()