зеркало из https://github.com/mozilla/pjs.git
Bug 293421: "View->Threads->Threads with Unread" lost after message view; r/sr=bienvenu
This commit is contained in:
Родитель
78f0e2d4b8
Коммит
fbe54ac96b
|
@ -902,6 +902,7 @@ function FolderPaneSelectionChange()
|
|||
var sortOrder = 0;
|
||||
var viewFlags = 0;
|
||||
var viewType = 0;
|
||||
gDefaultSearchViewTerms = null;
|
||||
gVirtualFolderTerms = null;
|
||||
gXFVirtualFolderTerms = null;
|
||||
gPrevFolderFlags = folderFlags;
|
||||
|
@ -981,7 +982,7 @@ function FolderPaneSelectionChange()
|
|||
|
||||
if (gXFVirtualFolderTerms)
|
||||
viewType = nsMsgViewType.eShowVirtualFolderResults;
|
||||
else if (gSearchEmailAddress || gDefaultSearchViewTerms || gVirtualFolderTerms)
|
||||
else if (gSearchEmailAddress || gVirtualFolderTerms)
|
||||
viewType = nsMsgViewType.eShowQuickSearchResults;
|
||||
else if (viewType == nsMsgViewType.eShowQuickSearchResults)
|
||||
viewType = nsMsgViewType.eShowAllThreads; //override viewType - we don't want to start w/ quick search
|
||||
|
|
|
@ -847,6 +847,7 @@ function FolderPaneSelectionChange()
|
|||
var sortOrder = 0;
|
||||
var viewFlags = 0;
|
||||
var viewType = 0;
|
||||
gDefaultSearchViewTerms = null;
|
||||
gVirtualFolderTerms = null;
|
||||
gXFVirtualFolderTerms = null;
|
||||
gPrevFolderFlags = folderFlags;
|
||||
|
@ -927,7 +928,7 @@ function FolderPaneSelectionChange()
|
|||
|
||||
if (gXFVirtualFolderTerms)
|
||||
viewType = nsMsgViewType.eShowVirtualFolderResults;
|
||||
else if (gSearchEmailAddress || gDefaultSearchViewTerms || gVirtualFolderTerms)
|
||||
else if (gSearchEmailAddress || gVirtualFolderTerms)
|
||||
viewType = nsMsgViewType.eShowQuickSearchResults;
|
||||
else if (viewType == nsMsgViewType.eShowQuickSearchResults)
|
||||
viewType = nsMsgViewType.eShowAllThreads; //override viewType - we don't want to start w/ quick search
|
||||
|
|
Загрузка…
Ссылка в новой задаче