From cb61b0a26d927d6312f9c67c7dd21f2450e7e578 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Mon, 6 May 2019 12:09:27 +0300 Subject: [PATCH] [DE mobile] Add Split Cell in context table menu --- .../mobile/app/controller/DocumentHolder.js | 65 ++++++++++++++++++- apps/documenteditor/mobile/locale/en.json | 4 ++ 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/apps/documenteditor/mobile/app/controller/DocumentHolder.js b/apps/documenteditor/mobile/app/controller/DocumentHolder.js index 9cf53f5d3..e7b301029 100644 --- a/apps/documenteditor/mobile/app/controller/DocumentHolder.js +++ b/apps/documenteditor/mobile/app/controller/DocumentHolder.js @@ -125,6 +125,9 @@ define([ me.api.Paste(); } else if ('merge' == eventName) { me.api.MergeCells(); + } else if ('split' == eventName) { + _view.hideMenu(); + me.showSplitModal(); } else if ('delete' == eventName) { me.api.asc_Remove(); } else if ('edit' == eventName) { @@ -184,6 +187,55 @@ define([ _view.hideMenu(); }, + showSplitModal: function() { + var me = this, + picker; + uiApp.modal({ + title : me.menuSplit, + text: '', + afterText: + '
' + + '
' + + '
' + me.textColumns + '
' + + '
' + me.textRows + '
' + + '
' + + '
' + + '
', + buttons: [ + { + text: me.textCancel + }, + { + text: 'OK', + bold: true, + onClick: function () { + var size = picker.value; + if (me.api) { + me.api.SplitCell(parseInt(size[0]), parseInt(size[1])); + } + } + } + ] + }); + + picker = uiApp.picker({ + container: '#picker-split-size', + toolbar: false, + rotateEffect: true, + value: [3, 3], + cols: [{ + textAlign: 'center', + width: '100%', + values: [1,2,3,4,5,6,7,8,9,10] + }, { + textAlign: 'center', + width: '100%', + values: [1,2,3,4,5,6,7,8,9,10] + }] + }); + + }, + // API Handlers onEditorResize: function(cmp) { @@ -408,6 +460,13 @@ define([ }); } + if(isTable && me.api.CheckBeforeSplitCells()) { + menuItems.push({ + caption: me.menuSplit, + event: 'split' + }); + } + menuItems.push({ caption: me.menuDelete, event: 'delete' @@ -486,6 +545,9 @@ define([ }, textGuest: 'Guest', + textCancel: 'Cancel', + textColumns: 'Columns', + textRows: 'Rows', menuCut: 'Cut', menuCopy: 'Copy', menuPaste: 'Paste', @@ -500,7 +562,8 @@ define([ menuAcceptAll: 'Accept All', menuReject: 'Reject', menuRejectAll: 'Reject All', - menuMerge: 'Merge Cells' + menuMerge: 'Merge Cells', + menuSplit: 'Split Cell' } })(), DE.Controllers.DocumentHolder || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 8167ca51d..0713487ed 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -30,6 +30,10 @@ "DE.Controllers.DocumentHolder.sheetCancel": "Cancel", "DE.Controllers.DocumentHolder.textGuest": "Guest", "DE.Controllers.DocumentHolder.menuMerge": "Merge Cells", + "DE.Controllers.DocumentHolder.menuSplit": "Split Cell", + "DE.Controllers.DocumentHolder.textCancel": "Cancel", + "DE.Controllers.DocumentHolder.textColumns": "Columns", + "DE.Controllers.DocumentHolder.textRows": "Rows", "DE.Controllers.EditContainer.textChart": "Chart", "DE.Controllers.EditContainer.textFooter": "Footer", "DE.Controllers.EditContainer.textHeader": "Header",