From 503ee98e6a97c135920fb0e00fa1c6810ef2ae7b Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Fri, 13 May 2016 15:13:01 +0300
Subject: [PATCH] =?UTF-8?q?[SSE]=20=D0=98=D0=B7=20=D1=81=D0=BF=D0=B8=D1=81?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=B2=20=D1=87=D0=B8=D1=81=D0=BB=D0=BE=D0=B2=D1=8B?=
 =?UTF-8?q?=D1=85=20=D0=B8=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=D0=BE=D0=B2?=
 =?UTF-8?q?=D1=8B=D1=85=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=BE=D0=B2?=
 =?UTF-8?q?=20=D1=83=D0=B1=D1=80=D0=B0=D0=BB=D0=B0=20=D0=BF=D1=83=D0=BD?=
 =?UTF-8?q?=D0=BA=D1=82=20None=20(=D1=82.=D0=BA.=20=D0=B5=D0=B3=D0=BE=20?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B0=D0=BB=D0=BE=D0=B3=20Clear=20-=20=D1=87=D0=B8?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D1=82=20=D0=B2=D1=81=D0=B5=20=D1=84=D0=B8?=
 =?UTF-8?q?=D0=BB=D1=8C=D1=82=D1=80=D1=8B).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/app/view/AutoFilterDialog.js                 | 11 ++---------
 apps/spreadsheeteditor/main/locale/en.json            |  1 -
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
index 763065358..24c041b90 100644
--- a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
+++ b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
@@ -584,7 +584,6 @@ define([
                 menu        : new Common.UI.Menu({
                     menuAlign: 'tl-tr',
                     items: [
-                        {value: 0,                                                   caption: this.textNoFilter,    checkable: true},
                         {value: Asc.c_oAscCustomAutoFilter.equals,                   caption: this.txtEquals,       checkable: true, type: Asc.c_oAscAutoFilterTypes.CustomFilters},
                         {value: Asc.c_oAscCustomAutoFilter.doesNotEqual,             caption: this.txtNotEquals,    checkable: true, type: Asc.c_oAscAutoFilterTypes.CustomFilters},
                         {value: Asc.c_oAscCustomAutoFilter.isGreaterThan,            caption: this.txtGreater,      checkable: true, type: Asc.c_oAscAutoFilterTypes.CustomFilters},
@@ -600,8 +599,7 @@ define([
                 })
             });
             var items = this.miNumFilter.menu.items;
-            items[0].on('click', _.bind(this.onClear, this));
-            for (var i=1; i<items.length; i++) {
+            for (var i=0; i<items.length; i++) {
                 items[i].on('click', _.bind((items[i].options.type == Asc.c_oAscAutoFilterTypes.CustomFilters) ? this.onNumCustomFilterItemClick :
                                             ((items[i].options.type == Asc.c_oAscAutoFilterTypes.DynamicFilter) ? this.onNumDynamicFilterItemClick : this.onTop10FilterItemClick ), this));
             }
@@ -614,7 +612,6 @@ define([
                 menu        : new Common.UI.Menu({
                     menuAlign: 'tl-tr',
                     items: [
-                        {value: 0,                                                   caption: this.textNoFilter,    checkable: true},
                         {value: Asc.c_oAscCustomAutoFilter.equals,                   caption: this.txtEquals,       checkable: true, type: Asc.c_oAscAutoFilterTypes.CustomFilters},
                         {value: Asc.c_oAscCustomAutoFilter.doesNotEqual,             caption: this.txtNotEquals,    checkable: true, type: Asc.c_oAscAutoFilterTypes.CustomFilters},
                         {value: Asc.c_oAscCustomAutoFilter.beginsWith,               caption: this.txtBegins,       checkable: true, type: Asc.c_oAscAutoFilterTypes.CustomFilters},
@@ -875,10 +872,7 @@ define([
                 value2 = ((customFilters.length>1) ? (null === customFilters[1].asc_getVal() ? '' : customFilters[1].asc_getVal()) : '');
             }
 
-            if (item.value==0) {
-                this.onClear();
-                return;
-            } else if (item.value!==-1) {
+            if (item.value!==-1) {
                 var newCustomFilter = new Asc.CustomFilters();
                 newCustomFilter.asc_setCustomFilters([new Asc.CustomFilter()]);
 
@@ -1341,7 +1335,6 @@ define([
         txtNotEnds          : "Does not end with...",
         txtContains         : "Contains...",
         txtNotContains      : "Does not contain...",
-        textNoFilter        : "None",
         textSelectAllResults: 'Select All Search Results',
         textAddSelection    : 'Add current selection to filter'
 
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index 28714f586..3f891cfee 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -270,7 +270,6 @@
   "SSE.Views.AutoFilterDialog.txtNotEnds": "Does not end with...",
   "SSE.Views.AutoFilterDialog.txtContains": "Contains...",
   "SSE.Views.AutoFilterDialog.txtNotContains": "Does not contain...",
-  "SSE.Views.AutoFilterDialog.textNoFilter": "None",
   "SSE.Views.AutoFilterDialog.textSelectAllResults": "Select All Search Results",
   "SSE.Views.AutoFilterDialog.textAddSelection": "Add current selection to filter",
   "SSE.Views.CellEditor.textManager": "Name Manager",