Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] Добавлена сортировка по цветам в контекстное меню.

Browse source
This commit is contained in:
Julia Radzhabova 2016-05-17 11:33:39 +03:00
parent 3875b0aae6
commit fa40ed5110
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -338,7 +338,7 @@ define([
onSortCells: function(menu, item) { onSortCells: function(menu, item) {
if (this.api) { 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.NotificationCenter.trigger('edit:complete', this.documentHolder);
Common.component.Analytics.trackEvent('DocumentHolder', 'Sort Cells'); Common.component.Analytics.trackEvent('DocumentHolder', 'Sort Cells');

11
apps/spreadsheeteditor/main/app/view/DocumentHolder.js
View file

@ -234,6 +234,12 @@ define([
},{ },{
caption : me.txtDescending, caption : me.txtDescending,
value : Asc.c_oAscSortOptions.Descending 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', txtFilterValue: 'Filter by Selected cell\'s value',
txtFilterCellColor: 'Filter by cell\'s color', txtFilterCellColor: 'Filter by cell\'s color',
txtFilterFontColor: 'Filter by font 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 || {})); }, SSE.Views.DocumentHolder || {}));
}); });

7
apps/spreadsheeteditor/main/locale/en.json
View file

@ -485,6 +485,13 @@
"SSE.Views.DocumentHolder.deleteRowText": "Delete Row", "SSE.Views.DocumentHolder.deleteRowText": "Delete Row",
"SSE.Views.DocumentHolder.deleteColumnText": "Delete Column", "SSE.Views.DocumentHolder.deleteColumnText": "Delete Column",
"SSE.Views.DocumentHolder.deleteTableText": "Delete Table", "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.btnBackCaption": "Go to Documents",
"SSE.Views.FileMenu.btnCreateNewCaption": "Create New", "SSE.Views.FileMenu.btnCreateNewCaption": "Create New",
"SSE.Views.FileMenu.btnDownloadCaption": "Download as...", "SSE.Views.FileMenu.btnDownloadCaption": "Download as...",