From f50d32b597f15335259c4b66a507336afe3d04f3 Mon Sep 17 00:00:00 2001 From: Alexander Trofimov Date: Thu, 14 May 2020 11:50:34 +0300 Subject: [PATCH] [SSE] Move Move asc_getLockText to cell info --- apps/spreadsheeteditor/main/app/controller/DocumentHolder.js | 2 +- apps/spreadsheeteditor/main/app/controller/Toolbar.js | 2 +- .../spreadsheeteditor/mobile/app/controller/DocumentHolder.js | 2 +- apps/spreadsheeteditor/mobile/app/controller/add/AddLink.js | 4 ++-- .../mobile/app/controller/edit/EditHyperlink.js | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index efa047a3b..5b4acbc15 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -545,7 +545,7 @@ define([ currentSheet: me.api.asc_getWorksheetName(me.api.asc_getActiveWorksheetIndex()), props : props, text : cell.asc_getText(), - isLock : cell.asc_getFlags().asc_getLockText(), + isLock : cell.asc_getLockText(), allowInternal: item.options.inCell }); } diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 3a968a5cd..111827f50 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -923,7 +923,7 @@ define([ currentSheet: me.api.asc_getWorksheetName(me.api.asc_getActiveWorksheetIndex()), props : props, text : cell.asc_getText(), - isLock : cell.asc_getFlags().asc_getLockText(), + isLock : cell.asc_getLockText(), allowInternal: (seltype!==Asc.c_oAscSelectionType.RangeImage && seltype!==Asc.c_oAscSelectionType.RangeShape && seltype!==Asc.c_oAscSelectionType.RangeShapeText && seltype!==Asc.c_oAscSelectionType.RangeChart && seltype!==Asc.c_oAscSelectionType.RangeChartText) diff --git a/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js index c62fc39ab..4f59a163c 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js @@ -436,7 +436,7 @@ define([ event: 'openlink' }); } else if (!cellinfo.asc_getHyperlink() && !cellinfo.asc_getMultiselect() && - !cellinfo.asc_getFlags().asc_getLockText() && !!cellinfo.asc_getText()) { + !cellinfo.asc_getLockText() && !!cellinfo.asc_getText()) { arrItems.push({ caption: me.menuAddLink, event: 'addlink' diff --git a/apps/spreadsheeteditor/mobile/app/controller/add/AddLink.js b/apps/spreadsheeteditor/mobile/app/controller/add/AddLink.js index 793834217..d210ca980 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/add/AddLink.js +++ b/apps/spreadsheeteditor/mobile/app/controller/add/AddLink.js @@ -76,7 +76,7 @@ define([ celltype!==Asc.c_oAscSelectionType.RangeShapeText && celltype!==Asc.c_oAscSelectionType.RangeChart && celltype!==Asc.c_oAscSelectionType.RangeChartText); - _view.optionDisplayText(cell.asc_getFlags().asc_getLockText() ? 'locked' : cell.asc_getText()); + _view.optionDisplayText(cell.asc_getLockText() ? 'locked' : cell.asc_getText()); _view.optionAllowInternal(allowinternal); allowinternal && _view.optionLinkType( cfgLink.type ); } @@ -163,7 +163,7 @@ define([ celltype!==Asc.c_oAscSelectionType.RangeShapeText && celltype!==Asc.c_oAscSelectionType.RangeChart && celltype!==Asc.c_oAscSelectionType.RangeChartText); - view.optionDisplayText(cell.asc_getFlags().asc_getLockText() ? 'locked' : cell.asc_getText()); + view.optionDisplayText(cell.asc_getLockText() ? 'locked' : cell.asc_getText()); view.optionAllowInternal(allowinternal); allowinternal && view.optionLinkType( cfgLink.type ); diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditHyperlink.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditHyperlink.js index c0d74b8c5..faa67a222 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditHyperlink.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditHyperlink.js @@ -133,7 +133,7 @@ define([ var cellInfo = me.api.asc_getCellInfo(), linkInfo = cellInfo.asc_getHyperlink(), - isLock = cellInfo.asc_getFlags().asc_getLockText(); + isLock = cellInfo.asc_getLockText(); me.linkType = linkInfo.asc_getType(); $('#edit-link-type .item-after').text((me.linkType == Asc.c_oAscHyperlinkType.RangeLink) ? me.textInternalLink : me.textExternalLink);