From 4f47545717c3f1fced78ea971430938d6e3f8fa1 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 25 Nov 2016 15:58:57 +0300 Subject: [PATCH] [SSE] Added sparkline clearing to context menu. --- .../main/app/controller/DocumentHolder.js | 7 +++++-- .../main/app/view/DocumentHolder.js | 17 ++++++++++++++++- apps/spreadsheeteditor/main/locale/en.json | 3 +++ apps/spreadsheeteditor/main/locale/ru.json | 3 +++ 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index f170bf418..aa304ee62 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -153,6 +153,7 @@ define([ view.pmiDeleteEntire.on('click', _.bind(me.onDeleteEntire, me)); view.pmiInsertCells.menu.on('item:click', _.bind(me.onInsertCells, me)); view.pmiDeleteCells.menu.on('item:click', _.bind(me.onDeleteCells, me)); + view.pmiSparklines.menu.on('item:click', _.bind(me.onClear, me)); view.pmiSortCells.menu.on('item:click', _.bind(me.onSortCells, me)); view.pmiFilterCells.menu.on('item:click', _.bind(me.onFilterCells, me)); view.pmiReapply.on('click', _.bind(me.onReapply, me)); @@ -1265,6 +1266,7 @@ define([ var iscelledit = this.api.isCellEdited, formatTableInfo = cellinfo.asc_getFormatTableInfo(), + isinsparkline = (cellinfo.asc_getSparklineInfo()!==null), isintable = (formatTableInfo !== null), ismultiselect = cellinfo.asc_getFlags().asc_getMultiselect(); documentHolder.ssMenu.formatTableName = (isintable) ? formatTableInfo.asc_getTableName() : null; @@ -1279,10 +1281,11 @@ define([ documentHolder.pmiSelectTable.setVisible(iscellmenu && !iscelledit && isintable); documentHolder.pmiInsertTable.setVisible(iscellmenu && !iscelledit && isintable); documentHolder.pmiDeleteTable.setVisible(iscellmenu && !iscelledit && isintable); + documentHolder.pmiSparklines.setVisible(isinsparkline); documentHolder.pmiSortCells.setVisible((iscellmenu||isallmenu||cansort) && !iscelledit); documentHolder.pmiFilterCells.setVisible((iscellmenu||cansort) && !iscelledit); documentHolder.pmiReapply.setVisible((iscellmenu||isallmenu||cansort) && !iscelledit); - documentHolder.ssMenu.items[12].setVisible((iscellmenu||isallmenu||cansort) && !iscelledit); + documentHolder.ssMenu.items[12].setVisible((iscellmenu||isallmenu||cansort||isinsparkline) && !iscelledit); documentHolder.pmiInsFunction.setVisible(iscellmenu||insfunc); documentHolder.pmiAddNamedRange.setVisible(iscellmenu && !iscelledit); @@ -1311,7 +1314,7 @@ define([ documentHolder.pmiEntriesList.setVisible(!iscelledit); /** coauthoring begin **/ - documentHolder.ssMenu.items[16].setVisible(iscellmenu && !iscelledit && this.permissions.canCoAuthoring && this.permissions.canComments); + documentHolder.ssMenu.items[17].setVisible(iscellmenu && !iscelledit && this.permissions.canCoAuthoring && this.permissions.canComments); documentHolder.pmiAddComment.setVisible(iscellmenu && !iscelledit && this.permissions.canCoAuthoring && this.permissions.canComments); /** coauthoring end **/ documentHolder.pmiCellMenuSeparator.setVisible(iscellmenu || isrowmenu || iscolmenu || isallmenu || insfunc); diff --git a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js index da1e92db1..417ca9b15 100644 --- a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js @@ -349,6 +349,17 @@ define([ caption : me.textEntriesList }); + me.pmiSparklines = new Common.UI.MenuItem({ + caption : me.txtSparklines, + menu : new Common.UI.Menu({ + menuAlign: 'tl-tr', + items : [ + { caption: me.txtClearSparklines, value: Asc.c_oAscCleanOptions.Sparklines }, + { caption: me.txtClearSparklineGroups, value: Asc.c_oAscCleanOptions.SparklineGroups } + ] + }) + }); + me.ssMenu = new Common.UI.Menu({ id : 'id-context-menu-cell', items : [ @@ -365,6 +376,7 @@ define([ me.pmiDeleteTable, me.pmiClear, {caption: '--'}, + me.pmiSparklines, me.pmiSortCells, me.pmiFilterCells, me.pmiReapply, @@ -691,7 +703,10 @@ define([ txtAutoRowHeight: 'Auto Fit Row Height', txtCustomColumnWidth: 'Custom Column Width', txtCustomRowHeight: 'Custom Row Height', - textEntriesList: 'Select from drop-down list' + textEntriesList: 'Select from drop-down list', + txtSparklines: 'Sparklines', + txtClearSparklines: 'Clear Selected Sparklines', + txtClearSparklineGroups: 'Clear Selected Sparkline Groups' }, 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 a9806180c..057f61ba3 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -940,6 +940,9 @@ "SSE.Views.DocumentHolder.txtUngroup": "Ungroup", "SSE.Views.DocumentHolder.txtWidth": "Width", "SSE.Views.DocumentHolder.vertAlignText": "Vertical Alignment", + "SSE.Views.DocumentHolder.txtSparklines": "Sparklines", + "SSE.Views.DocumentHolder.txtClearSparklines": "Clear Selected Sparklines", + "SSE.Views.DocumentHolder.txtClearSparklineGroups": "Clear Selected Sparkline Groups", "SSE.Views.FileMenu.btnBackCaption": "Go to Documents", "SSE.Views.FileMenu.btnCloseMenuCaption": "Close Menu", "SSE.Views.FileMenu.btnCreateNewCaption": "Create New", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 2b59d4e2e..db4555366 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -938,6 +938,9 @@ "SSE.Views.DocumentHolder.txtUngroup": "Разгруппировать", "SSE.Views.DocumentHolder.txtWidth": "Ширина", "SSE.Views.DocumentHolder.vertAlignText": "Вертикальное выравнивание", + "SSE.Views.DocumentHolder.txtSparklines": "Спарклайны", + "SSE.Views.DocumentHolder.txtClearSparklines": "Очистить выбранные спарклайны", + "SSE.Views.DocumentHolder.txtClearSparklineGroups": "Очистить выбранные группы спарклайнов", "SSE.Views.FileMenu.btnBackCaption": "Перейти к Документам", "SSE.Views.FileMenu.btnCloseMenuCaption": "Закрыть меню", "SSE.Views.FileMenu.btnCreateNewCaption": "Создать новую",