From 4a282e307a766eb4c6a491217e279eebde8438db Mon Sep 17 00:00:00 2001 From: Alexander Trofimov Date: Thu, 14 May 2020 11:45:23 +0300 Subject: [PATCH] [SSE] Move Move asc_getMultiselect to cell info --- apps/spreadsheeteditor/main/app/controller/DataTab.js | 2 +- apps/spreadsheeteditor/main/app/controller/DocumentHolder.js | 2 +- apps/spreadsheeteditor/main/app/controller/Toolbar.js | 2 +- .../spreadsheeteditor/mobile/app/controller/DocumentHolder.js | 4 ++-- .../mobile/app/controller/edit/EditContainer.js | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/DataTab.js b/apps/spreadsheeteditor/main/app/controller/DataTab.js index e310cf1dc..6aa5e25db 100644 --- a/apps/spreadsheeteditor/main/app/controller/DataTab.js +++ b/apps/spreadsheeteditor/main/app/controller/DataTab.js @@ -117,7 +117,7 @@ define([ // special disable conditions Common.Utils.lockControls(SSE.enumLock.multiselectCols, info.asc_getSelectedColsCount()>1, {array: [this.view.btnTextToColumns]}); - Common.Utils.lockControls(SSE.enumLock.multiselect, info.asc_getFlags().asc_getMultiselect(), {array: [this.view.btnTextToColumns]}); + Common.Utils.lockControls(SSE.enumLock.multiselect, info.asc_getMultiselect(), {array: [this.view.btnTextToColumns]}); }, onUngroup: function(type) { diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 498dcc0b5..efa047a3b 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1740,7 +1740,7 @@ define([ formatTableInfo = cellinfo.asc_getFormatTableInfo(), isinsparkline = (cellinfo.asc_getSparklineInfo()!==null), isintable = (formatTableInfo !== null), - ismultiselect = cellinfo.asc_getFlags().asc_getMultiselect(); + ismultiselect = cellinfo.asc_getMultiselect(); documentHolder.ssMenu.formatTableName = (isintable) ? formatTableInfo.asc_getTableName() : null; documentHolder.ssMenu.cellColor = cellinfo.asc_getFillColor(); documentHolder.ssMenu.fontColor = cellinfo.asc_getFont().asc_getColor(); diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 793ae20bd..3a968a5cd 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -2361,7 +2361,7 @@ define([ if (this._state.tablename !== old_name || this._state.filterapplied !== old_applied) this.getApplication().getController('Statusbar').onApiFilterInfo(!need_disable); - this._state.multiselect = info.asc_getFlags().asc_getMultiselect(); + this._state.multiselect = info.asc_getMultiselect(); toolbar.lockToolbar(SSE.enumLock.multiselect, this._state.multiselect, { array: [toolbar.btnTableTemplate, toolbar.btnInsertHyperlink, toolbar.btnInsertTable]}); this._state.inpivot = !!info.asc_getPivotTableInfo(); diff --git a/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js index 847e79265..c62fc39ab 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js @@ -430,12 +430,12 @@ define([ event: 'wrap' }); - if (cellinfo.asc_getHyperlink() && !cellinfo.asc_getFlags().asc_getMultiselect()) { + if (cellinfo.asc_getHyperlink() && !cellinfo.asc_getMultiselect()) { arrItems.push({ caption: me.menuOpenLink, event: 'openlink' }); - } else if (!cellinfo.asc_getHyperlink() && !cellinfo.asc_getFlags().asc_getMultiselect() && + } else if (!cellinfo.asc_getHyperlink() && !cellinfo.asc_getMultiselect() && !cellinfo.asc_getFlags().asc_getLockText() && !!cellinfo.asc_getText()) { arrItems.push({ caption: me.menuAddLink, diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditContainer.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditContainer.js index 3c962f9e6..3469028f0 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditContainer.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditContainer.js @@ -495,7 +495,7 @@ define([ // formatTableInfo = cellInfo.asc_getFormatTableInfo(), // isinsparkline = (cellInfo.asc_getSparklineInfo()!==null), // isintable = (formatTableInfo !== null), - // ismultiselect = cellInfo.asc_getFlags().asc_getMultiselect(); + // ismultiselect = cellInfo.asc_getMultiselect(); // documentHolder.ssMenu.formatTableName = (isintable) ? formatTableInfo.asc_getTableName() : null; // documentHolder.ssMenu.cellColor = cellInfo.asc_getFill().asc_getColor(); // documentHolder.ssMenu.fontColor = cellInfo.asc_getFont().asc_getColor();