From fa40ed51102485d094f67bea7d14ba0a88c28ffc Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 17 May 2016 11:33:39 +0300 Subject: [PATCH] =?UTF-8?q?[SSE]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=81=D0=BE=D1=80=D1=82=D0=B8=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=BA=D0=B0=20=D0=BF=D0=BE=20=D1=86=D0=B2=D0=B5=D1=82?= =?UTF-8?q?=D0=B0=D0=BC=20=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B5=D0=BA?= =?UTF-8?q?=D1=81=D1=82=D0=BD=D0=BE=D0=B5=20=D0=BC=D0=B5=D0=BD=D1=8E.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/app/controller/DocumentHolder.js | 2 +- .../spreadsheeteditor/main/app/view/DocumentHolder.js | 11 +++++++++-- apps/spreadsheeteditor/main/locale/en.json | 7 +++++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 7a32a8a4b..222d2dd00 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -338,7 +338,7 @@ define([ onSortCells: function(menu, item) { if (this.api) { - this.api.asc_sortColFilter(item.value, ''); + this.api.asc_sortColFilter(item.value, '', null, (item.value==Asc.c_oAscSortOptions.ByColorFill) ? this.documentHolder.ssMenu.cellColor : this.documentHolder.ssMenu.fontColor); Common.NotificationCenter.trigger('edit:complete', this.documentHolder); Common.component.Analytics.trackEvent('DocumentHolder', 'Sort Cells'); diff --git a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js index 34b390566..9381d254c 100644 --- a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js @@ -234,6 +234,12 @@ define([ },{ caption : me.txtDescending, value : Asc.c_oAscSortOptions.Descending + },{ + caption : me.txtSortCellColor, + value : Asc.c_oAscSortOptions.ByColorFill + },{ + caption : me.txtSortFontColor, + value : Asc.c_oAscSortOptions.ByColorFont } ] }) @@ -660,7 +666,8 @@ define([ txtFilterValue: 'Filter by Selected cell\'s value', txtFilterCellColor: 'Filter by cell\'s color', txtFilterFontColor: 'Filter by font color', - txtReapply: 'Reapply' - + txtReapply: 'Reapply', + txtSortCellColor: 'Selected Cell Color on top', + txtSortFontColor: 'Selected Font Color on top' }, SSE.Views.DocumentHolder || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 3f891cfee..6fd51efe7 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -485,6 +485,13 @@ "SSE.Views.DocumentHolder.deleteRowText": "Delete Row", "SSE.Views.DocumentHolder.deleteColumnText": "Delete Column", "SSE.Views.DocumentHolder.deleteTableText": "Delete Table", + "SSE.Views.DocumentHolder.txtFilter": "Filter", + "SSE.Views.DocumentHolder.txtFilterValue": "Filter by Selected cell's value", + "SSE.Views.DocumentHolder.txtFilterCellColor": "Filter by cell's color", + "SSE.Views.DocumentHolder.txtFilterFontColor": "Filter by font color", + "SSE.Views.DocumentHolder.txtReapply": "Reapply", + "SSE.Views.DocumentHolder.txtSortCellColor": "Selected Cell Color on top", + "SSE.Views.DocumentHolder.txtSortFontColor": "Selected Font Color on top", "SSE.Views.FileMenu.btnBackCaption": "Go to Documents", "SSE.Views.FileMenu.btnCreateNewCaption": "Create New", "SSE.Views.FileMenu.btnDownloadCaption": "Download as...",