From ada2eca0eafbec81e64c6ef47814f742d4736dfd Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 1 Apr 2016 16:30:53 +0300 Subject: [PATCH] =?UTF-8?q?[SSE]=20Disable/Enable=20=D0=BF=D1=83=D0=BD?= =?UTF-8?q?=D0=BA=D1=82=D0=BE=D0=B2=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D1=82=D0=B0?= =?UTF-8?q?=D0=B1=D0=BB=D0=B8=D1=86=D1=8B.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/app/controller/DocumentHolder.js | 12 ++++++++++++ .../main/app/view/TableSettings.js | 14 ++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 112b7ed46b..ae8d7f00bc 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1162,6 +1162,18 @@ define([ documentHolder.pmiInsFunction.setVisible(iscellmenu||insfunc); documentHolder.pmiAddNamedRange.setVisible(iscellmenu && !iscelledit); + if (isintable) { + documentHolder.pmiInsertTable.menu.items[0].setDisabled(!formatTableInfo.asc_getIsInsertRowAbove()); + documentHolder.pmiInsertTable.menu.items[1].setDisabled(!formatTableInfo.asc_getIsInsertRowBelow()); + documentHolder.pmiInsertTable.menu.items[2].setDisabled(!formatTableInfo.asc_getIsInsertColumnLeft()); + documentHolder.pmiInsertTable.menu.items[3].setDisabled(!formatTableInfo.asc_getIsInsertColumnRight()); + + documentHolder.pmiDeleteTable.menu.items[0].setDisabled(!formatTableInfo.asc_getIsDeleteRow()); + documentHolder.pmiDeleteTable.menu.items[1].setDisabled(!formatTableInfo.asc_getIsDeleteColumn()); + documentHolder.pmiDeleteTable.menu.items[2].setDisabled(!formatTableInfo.asc_getIsDeleteTable()); + + } + var hyperinfo = cellinfo.asc_getHyperlink(); documentHolder.menuHyperlink.setVisible(iscellmenu && hyperinfo && !iscelledit); documentHolder.menuAddHyperlink.setVisible(iscellmenu && !hyperinfo && !iscelledit); diff --git a/apps/spreadsheeteditor/main/app/view/TableSettings.js b/apps/spreadsheeteditor/main/app/view/TableSettings.js index eadd5e5cab..7691b03adc 100644 --- a/apps/spreadsheeteditor/main/app/view/TableSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TableSettings.js @@ -161,10 +161,16 @@ define([ }) }); this.btnEdit.render( $('#table-btn-edit')) ; - this.btnEdit.menu.on('show:after', _.bind( function(){ + this.btnEdit.menu.on('show:after', _.bind( function(menu){ if (this.api) { -// this.mnuMerge.setDisabled(!this.api.CheckBeforeMergeCells()); -// this.mnuSplit.setDisabled(!this.api.CheckBeforeSplitCells()); + menu.items[5].setDisabled(!this._originalProps.asc_getIsInsertRowAbove()); + menu.items[6].setDisabled(!this._originalProps.asc_getIsInsertRowBelow()); + menu.items[7].setDisabled(!this._originalProps.asc_getIsInsertColumnLeft()); + menu.items[8].setDisabled(!this._originalProps.asc_getIsInsertColumnRight()); + + menu.items[10].setDisabled(!this._originalProps.asc_getIsDeleteRow()); + menu.items[11].setDisabled(!this._originalProps.asc_getIsDeleteColumn()); + menu.items[12].setDisabled(!this._originalProps.asc_getIsDeleteTable()); } }, this)); this.btnEdit.menu.on('item:click', _.bind(this.onEditClick, this)); @@ -173,7 +179,7 @@ define([ onCheckTemplateChange: function(type, field, newValue, oldValue, eOpts) { if (this.api) - this.api.asc_changeFormatTableInfo(this._state.TableName, type); + this.api.asc_changeFormatTableInfo(this._state.TableName, type, newValue=='checked'); Common.NotificationCenter.trigger('edit:complete', this); },