Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] Move

Browse source 
Move asc_getLockText to cell info
This commit is contained in:
Alexander Trofimov 2020-05-14 11:50:34 +03:00
parent 4a282e307a
commit f50d32b597
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -545,7 +545,7 @@ define([
currentSheet: me.api.asc_getWorksheetName(me.api.asc_getActiveWorksheetIndex()), currentSheet: me.api.asc_getWorksheetName(me.api.asc_getActiveWorksheetIndex()),
props : props, props : props,
text : cell.asc_getText(), text : cell.asc_getText(),
isLock : cell.asc_getFlags().asc_getLockText(), isLock : cell.asc_getLockText(),
allowInternal: item.options.inCell allowInternal: item.options.inCell
}); });
} }

2
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -923,7 +923,7 @@ define([
currentSheet: me.api.asc_getWorksheetName(me.api.asc_getActiveWorksheetIndex()), currentSheet: me.api.asc_getWorksheetName(me.api.asc_getActiveWorksheetIndex()),
props : props, props : props,
text : cell.asc_getText(), 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 && 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.RangeShapeText && seltype!==Asc.c_oAscSelectionType.RangeChart &&
seltype!==Asc.c_oAscSelectionType.RangeChartText) seltype!==Asc.c_oAscSelectionType.RangeChartText)

2
apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
View file

@ -436,7 +436,7 @@ define([
event: 'openlink' event: 'openlink'
}); });
} else if (!cellinfo.asc_getHyperlink() && !cellinfo.asc_getMultiselect() && } else if (!cellinfo.asc_getHyperlink() && !cellinfo.asc_getMultiselect() &&
!cellinfo.asc_getFlags().asc_getLockText() && !!cellinfo.asc_getText()) { !cellinfo.asc_getLockText() && !!cellinfo.asc_getText()) {
arrItems.push({ arrItems.push({
caption: me.menuAddLink, caption: me.menuAddLink,
event: 'addlink' event: 'addlink'

4
apps/spreadsheeteditor/mobile/app/controller/add/AddLink.js
View file

@ -76,7 +76,7 @@ define([
celltype!==Asc.c_oAscSelectionType.RangeShapeText && celltype!==Asc.c_oAscSelectionType.RangeChart && celltype!==Asc.c_oAscSelectionType.RangeShapeText && celltype!==Asc.c_oAscSelectionType.RangeChart &&
celltype!==Asc.c_oAscSelectionType.RangeChartText); 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); _view.optionAllowInternal(allowinternal);
allowinternal && _view.optionLinkType( cfgLink.type ); allowinternal && _view.optionLinkType( cfgLink.type );
} }
@ -163,7 +163,7 @@ define([
celltype!==Asc.c_oAscSelectionType.RangeShapeText && celltype!==Asc.c_oAscSelectionType.RangeChart && celltype!==Asc.c_oAscSelectionType.RangeShapeText && celltype!==Asc.c_oAscSelectionType.RangeChart &&
celltype!==Asc.c_oAscSelectionType.RangeChartText); 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); view.optionAllowInternal(allowinternal);
allowinternal && view.optionLinkType( cfgLink.type ); allowinternal && view.optionLinkType( cfgLink.type );

2
apps/spreadsheeteditor/mobile/app/controller/edit/EditHyperlink.js
View file

@ -133,7 +133,7 @@ define([
var cellInfo = me.api.asc_getCellInfo(), var cellInfo = me.api.asc_getCellInfo(),
linkInfo = cellInfo.asc_getHyperlink(), linkInfo = cellInfo.asc_getHyperlink(),
isLock = cellInfo.asc_getFlags().asc_getLockText(); isLock = cellInfo.asc_getLockText();
me.linkType = linkInfo.asc_getType(); me.linkType = linkInfo.asc_getType();
$('#edit-link-type .item-after').text((me.linkType == Asc.c_oAscHyperlinkType.RangeLink) ? me.textInternalLink : me.textExternalLink); $('#edit-link-type .item-after').text((me.linkType == Asc.c_oAscHyperlinkType.RangeLink) ? me.textInternalLink : me.textExternalLink);