From 1697ee0baf6b454b32f117465e5b9af24fa8fbaf Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 29 Apr 2022 15:55:24 +0300 Subject: [PATCH] [DE] Document holder refactoring --- .../main/app/controller/DocumentHolder.js | 68 +++++- .../main/app/view/DocumentHolder.js | 198 ++++++++---------- 2 files changed, 156 insertions(+), 110 deletions(-) diff --git a/apps/documenteditor/main/app/controller/DocumentHolder.js b/apps/documenteditor/main/app/controller/DocumentHolder.js index 8d58a7200..22cfdb9a1 100644 --- a/apps/documenteditor/main/app/controller/DocumentHolder.js +++ b/apps/documenteditor/main/app/controller/DocumentHolder.js @@ -385,7 +385,9 @@ define([ view.menuDropCapAdvanced.on('click', _.bind(me.advancedFrameClick, me, false)); view.menuStyleSave.on('click', _.bind(me.onMenuSaveStyle, me)); view.menuStyleUpdate.on('click', _.bind(me.onMenuUpdateStyle, me)); - + view.menuTableSelectText.menu.on('item:click', _.bind(me.tableSelectText, me)); + view.menuTableInsertText.menu.on('item:click', _.bind(me.tableInsertText, me)); + view.menuTableDeleteText.menu.on('item:click', _.bind(me.tableDeleteText, me)); }, @@ -1742,7 +1744,7 @@ define([ else { var me = this; (new DE.Views.NumberingValueDialog({ - title: me.textNumberingValue, + title: me.documentHolder.textNumberingValue, props: item.value, handler: function (result, value) { if (result == 'ok') @@ -1867,5 +1869,67 @@ define([ this.api.tblApply(properties); } }, + + tableSelectText: function(menu, item, e) { + if (this.api) { + switch (item.value) { + case 0: + this.api.selectRow(); + break; + case 1: + this.api.selectColumn(); + break; + case 2: + this.api.selectCell(); + break; + case 3: + this.api.selectTable(); + break; + } + } + }, + + tableInsertText: function(menu, item, e) { + if (this.api) { + switch (item.value) { + case 0: + this.api.addColumnLeft(); + break; + case 1: + this.api.addColumnRight(); + break; + case 2: + this.api.addRowAbove(); + break; + case 3: + this.api.addRowBelow(); + break; + case 4: + this.onCellsAdd(); + break; + } + } + }, + + tableDeleteText: function(menu, item, e) { + if (this.api) { + switch (item.value) { + case 0: + this.api.remRow(); + break; + case 1: + this.api.remColumn(); + break; + case 2: + this.api.remTable(); + break; + case 3: + this.onCellsRemove(); + break; + } + } + }, + + }); }); \ No newline at end of file diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index cf200299c..4de963d1e 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -198,7 +198,7 @@ define([ me.menuViewCut.setDisabled(disabled || !cancopy); me.menuViewPaste.setVisible(me._fillFormMode && canEditControl); me.menuViewPaste.setDisabled(disabled); - me.menuViewPrint.setVisible(me.mode.canPrint && !me._fillFormwMode); + me.menuViewPrint.setVisible(me.mode.canPrint && !me._fillFormMode); me.menuViewPrint.setDisabled(!cancopy); }, @@ -1356,6 +1356,92 @@ define([ caption : '--' }); + me.menuTableSelectText = new Common.UI.MenuItem({ + caption : me.selectText, + menu : new Common.UI.Menu({ + cls: 'shifted-right', + menuAlign: 'tl-tr', + style : 'width: 100px', + items : [ + new Common.UI.MenuItem({ + caption: me.rowText, + value: 0 + }), + new Common.UI.MenuItem({ + caption: me.columnText, + value: 1 + }), + new Common.UI.MenuItem({ + caption: me.cellText, + value: 2 + }), + new Common.UI.MenuItem({ + caption: me.tableText, + value: 3 + }) + ] + }) + }); + + me.menuTableInsertText = new Common.UI.MenuItem({ + iconCls: 'menu__icon btn-addcell', + caption : me.insertText, + menu : new Common.UI.Menu({ + cls: 'shifted-right', + menuAlign: 'tl-tr', + items : [ + new Common.UI.MenuItem({ + caption: me.insertColumnLeftText, + value: 0 + }), + new Common.UI.MenuItem({ + caption: me.insertColumnRightText, + value: 1 + }), + new Common.UI.MenuItem({ + caption: me.insertRowAboveText, + value: 2 + }), + new Common.UI.MenuItem({ + caption: me.insertRowBelowText, + value: 3 + }), + new Common.UI.MenuItem({ + caption: me.textSeveral, + value: 4 + }) + ] + }) + }); + + me.menuTableDeleteText = new Common.UI.MenuItem({ + iconCls: 'menu__icon btn-delcell', + caption : me.deleteText, + menu : new Common.UI.Menu({ + cls: 'shifted-right', + menuAlign: 'tl-tr', + style : 'width: 100px', + items : [ + new Common.UI.MenuItem({ + caption: me.rowText, + value: 0 + }), + new Common.UI.MenuItem({ + caption: me.columnText, + value: 1 + }), + new Common.UI.MenuItem({ + caption: me.tableText, + value: 2 + }), + new Common.UI.MenuItem({ + caption: me.textCells, + value: 3 + }) + ] + }) + }); + this.tableMenu = new Common.UI.Menu({ cls: 'shifted-right', restoreHeightAndTop: true, @@ -1569,113 +1655,9 @@ define([ menuEquationSeparatorInTable, menuTableRefreshField, menuTableFieldSeparator, - { - caption : me.selectText, - menu : new Common.UI.Menu({ - cls: 'shifted-right', - menuAlign: 'tl-tr', - style : 'width: 100px', - items : [ - new Common.UI.MenuItem({ - caption: me.rowText - }).on('click', function(item) { - if (me.api) - me.api.selectRow(); - }), - new Common.UI.MenuItem({ - caption: me.columnText - }).on('click', function(item) { - if (me.api) - me.api.selectColumn(); - }), - new Common.UI.MenuItem({ - caption: me.cellText - }).on('click', function(item) { - if (me.api) - me.api.selectCell(); - }), - new Common.UI.MenuItem({ - caption: me.tableText - }).on('click', function(item) { - if (me.api) - me.api.selectTable(); - }) - ] - }) - }, - { - iconCls: 'menu__icon btn-addcell', - caption : me.insertText, - menu : new Common.UI.Menu({ - cls: 'shifted-right', - menuAlign: 'tl-tr', - items : [ - new Common.UI.MenuItem({ - caption: me.insertColumnLeftText - }).on('click', function(item) { - if (me.api) - me.api.addColumnLeft(); - }), - new Common.UI.MenuItem({ - caption: me.insertColumnRightText - }).on('click', function(item) { - if (me.api) - me.api.addColumnRight(); - }), - new Common.UI.MenuItem({ - caption: me.insertRowAboveText - }).on('click', function(item) { - if (me.api) - me.api.addRowAbove(); - }), - new Common.UI.MenuItem({ - caption: me.insertRowBelowText - }).on('click', function(item) { - if (me.api) - me.api.addRowBelow(); - }), - new Common.UI.MenuItem({ - caption: me.textSeveral - }).on('click', function(item) { - me.onCellsAdd(); - }) - ] - }) - }, - { - iconCls: 'menu__icon btn-delcell', - caption : me.deleteText, - menu : new Common.UI.Menu({ - cls: 'shifted-right', - menuAlign: 'tl-tr', - style : 'width: 100px', - items : [ - new Common.UI.MenuItem({ - caption: me.rowText - }).on('click', function(item) { - if (me.api) - me.api.remRow(); - }), - new Common.UI.MenuItem({ - caption: me.columnText - }).on('click', function(item) { - if (me.api) - me.api.remColumn(); - }), - new Common.UI.MenuItem({ - caption: me.tableText - }).on('click', function(item) { - if (me.api) - me.api.remTable(); - }), - new Common.UI.MenuItem({ - caption: me.textCells - }).on('click', function(item) { - me.onCellsRemove(); - }) - ] - }) - }, + me.menuTableSelectText, + me.menuTableInsertText, + me.menuTableDeleteText, { caption: '--' }, mnuTableMerge, mnuTableSplit,