add c_oAscAutoFilterTypes.None

fb8236c5 · GoshaZotov · Alexander.Trofimov · eb0de63f · fb8236c5 · fb8236c5
Commit fb8236c5 authored May 06, 2016 by GoshaZotov Committed by Alexander.Trofimov May 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 3 deletions

cell/apiDefines.js cell/apiDefines.js +2 -1

cell/view/WorksheetView.js cell/view/WorksheetView.js +8 -2

No files found.
--- a/cell/apiDefines.js
+++ b/cell/apiDefines.js
@@ -226,7 +226,8 @@ var c_oAscAutoFilterTypes = {
  CustomFilters: 1,
  DynamicFilter: 2,
  Top10: 3,
-  Filters: 4
+  Filters: 4,
+  None: 5
 };

 var c_oAscCoAuthoringMeBorderColor = new CColor(22, 156, 0);

--- a/cell/view/WorksheetView.js
+++ b/cell/view/WorksheetView.js
@@ -12672,8 +12672,14 @@
            filterObj.type = c_oAscAutoFilterTypes.Top10;
            filterObj.filter = filters.Top10;
        }
-        else
-            filterObj.type = c_oAscAutoFilterTypes.Filters;
+        else if(filters)
+		{
+			filterObj.type = c_oAscAutoFilterTypes.Filters;
+		}
+		else
+		{
+			filterObj.type = c_oAscAutoFilterTypes.None;
+		}

        //get sort
        var sortVal = null;