зеркало из https://github.com/mozilla/gecko-dev.git
Bug 294534 Fix search dialog sort indicator regression r=Mnyromyr sr=bienvenu
This commit is contained in:
Родитель
58876b1950
Коммит
8ce9356c37
|
@ -417,17 +417,17 @@ function UpdateSortIndicators(sortType, sortOrder)
|
|||
{
|
||||
// show the twisties if the view is threaded
|
||||
var threadCol = document.getElementById("threadCol");
|
||||
var currCol;
|
||||
var sortedColumn;
|
||||
// set the sort indicator on the column we are sorted by
|
||||
var colID = ConvertSortTypeToColumnID(sortType);
|
||||
if (colID)
|
||||
sortedColumn = document.getElementById(colID);
|
||||
|
||||
currCol = gDBView.viewFlags & nsMsgViewFlagsType.kGroupBySort
|
||||
var dbview = GetDBView();
|
||||
var currCol = dbview.viewFlags & nsMsgViewFlagsType.kGroupBySort
|
||||
? sortedColumn : document.getElementById("subjectCol");
|
||||
|
||||
if (gDBView.viewFlags & nsMsgViewFlagsType.kGroupBySort)
|
||||
if (dbview.viewFlags & nsMsgViewFlagsType.kGroupBySort)
|
||||
{
|
||||
var threadTree = document.getElementById("threadTree");
|
||||
var subjectCol = document.getElementById("subjectCol");
|
||||
|
@ -444,10 +444,10 @@ function UpdateSortIndicators(sortType, sortOrder)
|
|||
}
|
||||
|
||||
// clear primary attribute from group column if going to a non-grouped view.
|
||||
if (!(gDBView.viewFlags & nsMsgViewFlagsType.kGroupBySort))
|
||||
if (!(dbview.viewFlags & nsMsgViewFlagsType.kGroupBySort))
|
||||
document.getElementById("threadCol").collapsed = false;
|
||||
|
||||
if ((GetDBView().viewFlags & nsMsgViewFlagsType.kThreadedDisplay) && !groupedBySortUsingDummyRow()) {
|
||||
if ((dbview.viewFlags & nsMsgViewFlagsType.kThreadedDisplay) && !groupedBySortUsingDummyRow()) {
|
||||
threadCol.setAttribute("sortDirection", "ascending");
|
||||
currCol.setAttribute("primary", "true");
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче