зеркало из https://github.com/mozilla/pjs.git
Bug #265478 --> When clicking on / away from virtual folders, weird focus issues with quick search box.
sr=bienvenu
This commit is contained in:
Родитель
f460604579
Коммит
890ae1e651
|
@ -807,7 +807,6 @@ function FolderPaneSelectionChange()
|
||||||
gVirtualFolderTerms = null;
|
gVirtualFolderTerms = null;
|
||||||
gXFVirtualFolderTerms = null;
|
gXFVirtualFolderTerms = null;
|
||||||
gPrevFolderFlags = folderFlags;
|
gPrevFolderFlags = folderFlags;
|
||||||
// gSearchInput.showingSearchCriteria = false;
|
|
||||||
gCurrentVirtualFolderUri = null;
|
gCurrentVirtualFolderUri = null;
|
||||||
// don't get the db if this folder is a server
|
// don't get the db if this folder is a server
|
||||||
// we're going to be display account central
|
// we're going to be display account central
|
||||||
|
@ -840,7 +839,6 @@ function FolderPaneSelectionChange()
|
||||||
viewType = nsMsgViewType.eShowVirtualFolderResults;
|
viewType = nsMsgViewType.eShowVirtualFolderResults;
|
||||||
gXFVirtualFolderTerms = CreateGroupedSearchTerms(tempFilter.searchTerms);
|
gXFVirtualFolderTerms = CreateGroupedSearchTerms(tempFilter.searchTerms);
|
||||||
setupXFVirtualFolderSearch(srchFolderUriArray, gXFVirtualFolderTerms, searchOnline);
|
setupXFVirtualFolderSearch(srchFolderUriArray, gXFVirtualFolderTerms, searchOnline);
|
||||||
gSearchInput.showingSearchCriteria = false;
|
|
||||||
// need to set things up so that reroot folder issues the search
|
// need to set things up so that reroot folder issues the search
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -852,10 +850,7 @@ function FolderPaneSelectionChange()
|
||||||
var realFolderRes = GetResourceFromUri(uriToLoad);
|
var realFolderRes = GetResourceFromUri(uriToLoad);
|
||||||
var realFolder = realFolderRes.QueryInterface(Components.interfaces.nsIMsgFolder);
|
var realFolder = realFolderRes.QueryInterface(Components.interfaces.nsIMsgFolder);
|
||||||
msgDatabase = realFolder.getMsgDatabase(msgWindow);
|
msgDatabase = realFolder.getMsgDatabase(msgWindow);
|
||||||
// dump("search term string = " + searchTermString + "\n");
|
|
||||||
|
|
||||||
gVirtualFolderTerms = CreateGroupedSearchTerms(tempFilter.searchTerms);
|
gVirtualFolderTerms = CreateGroupedSearchTerms(tempFilter.searchTerms);
|
||||||
gSearchInput.showingSearchCriteria = false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -256,7 +256,7 @@ var folderListener = {
|
||||||
{
|
{
|
||||||
gDefaultSearchViewTerms = null;
|
gDefaultSearchViewTerms = null;
|
||||||
viewDebug("searching gVirtualFolderTerms\n");
|
viewDebug("searching gVirtualFolderTerms\n");
|
||||||
onClearSearch(); // clear quick search bar
|
loadVirtualFolder();
|
||||||
}
|
}
|
||||||
else if (gMsgFolderSelected.flags & MSG_FOLDER_FLAG_VIRTUAL)
|
else if (gMsgFolderSelected.flags & MSG_FOLDER_FLAG_VIRTUAL)
|
||||||
{
|
{
|
||||||
|
@ -266,7 +266,7 @@ var folderListener = {
|
||||||
else if (gDefaultSearchViewTerms)
|
else if (gDefaultSearchViewTerms)
|
||||||
{
|
{
|
||||||
viewDebug("searching gDefaultSearchViewTerms and rerootingFolder\n");
|
viewDebug("searching gDefaultSearchViewTerms and rerootingFolder\n");
|
||||||
onClearSearch();
|
Search("");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -635,6 +635,14 @@ function Search(str)
|
||||||
onSearchInput(true);
|
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
|
// this notification gets generated from layout when it finishes laying out a message
|
||||||
// in the message pane.
|
// in the message pane.
|
||||||
function onQuickSearchNewMsgLoaded()
|
function onQuickSearchNewMsgLoaded()
|
||||||
|
|
Загрузка…
Ссылка в новой задаче