transfer to menu ConditionSortBy value

418d775c · GoshaZotov · Alexander.Trofimov · 3ffec925 · 418d775c
Commit 418d775c authored May 05, 2016 by GoshaZotov Committed by Alexander.Trofimov May 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 23 additions and 4 deletions

cell/view/WorksheetView.js cell/view/WorksheetView.js +23 -4

No files found.
--- a/cell/view/WorksheetView.js
+++ b/cell/view/WorksheetView.js
@@ -12679,10 +12679,29 @@
        {
            if(rangeButton.r1 == filter.SortState.SortConditions[0].Ref.r1 && rangeButton.c1 == filter.SortState.SortConditions[0].Ref.c1)
            {
-                if(filter.SortState.SortConditions[0].ConditionDescending == false)
-                    sortVal = 'descending';
-                else
-                    sortVal = 'ascending';
+                var conditionSortBy = filter.SortState.SortConditions[0].ConditionSortBy;
+				switch(conditionSortBy)
+				{
+					case Asc.ESortBy.sortbyCellColor:
+					{
+						sortVal = Asc.c_oAscSortOptions.ByColorFill;
+						break;
+					}
+					case Asc.ESortBy.sortbyFontColor:
+					{
+						sortVal = Asc.c_oAscSortOptions.ByColorFont;
+						break;
+					}
+					default:
+					{
+						if(filter.SortState.SortConditions[0].ConditionDescending == false)
+							sortVal = Asc.c_oAscSortOptions.Descending;
+						else
+							sortVal = Asc.c_oAscSortOptions.Ascending;
+						
+						break;
+					}
+				}
            }
        }