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

[SSE] Move

Browse source 
Move asc_getMerge to cell info
This commit is contained in:
Alexander Trofimov 2020-05-14 12:16:27 +03:00
parent e0268a7bee
commit 00fc3770d5
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -750,7 +750,7 @@ define([
} }
if (me.api) { if (me.api) {
var merged = me.api.asc_getCellInfo().asc_getFlags().asc_getMerge(); var merged = me.api.asc_getCellInfo().asc_getMerge();
if ((merged !== Asc.c_oAscMergeOptions.Merge) && me.api.asc_mergeCellsDataLost(item.value)) { if ((merged !== Asc.c_oAscMergeOptions.Merge) && me.api.asc_mergeCellsDataLost(item.value)) {
Common.UI.warning({ Common.UI.warning({
msg: me.warnMergeLostData, msg: me.warnMergeLostData,
@ -2312,7 +2312,7 @@ define([
// (need_disable !== toolbar.btnMerge.isDisabled()) && toolbar.btnMerge.setDisabled(need_disable); // (need_disable !== toolbar.btnMerge.isDisabled()) && toolbar.btnMerge.setDisabled(need_disable);
toolbar.lockToolbar(SSE.enumLock.ruleMerge, need_disable, {array:[toolbar.btnMerge, toolbar.btnInsertTable]}); toolbar.lockToolbar(SSE.enumLock.ruleMerge, need_disable, {array:[toolbar.btnMerge, toolbar.btnInsertTable]});
val = info.asc_getFlags().asc_getMerge(); val = info.asc_getMerge();
if (this._state.merge !== val) { if (this._state.merge !== val) {
toolbar.btnMerge.toggle(val===Asc.c_oAscMergeOptions.Merge, true); toolbar.btnMerge.toggle(val===Asc.c_oAscMergeOptions.Merge, true);
this._state.merge = val; this._state.merge = val;

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

@ -407,13 +407,13 @@ define([
event: 'edit' event: 'edit'
}); });
(cellinfo.asc_getFlags().asc_getMerge() == Asc.c_oAscMergeOptions.None) && (cellinfo.asc_getMerge() == Asc.c_oAscMergeOptions.None) &&
arrItems.push({ arrItems.push({
caption: me.menuMerge, caption: me.menuMerge,
event: 'merge' event: 'merge'
}); });
(cellinfo.asc_getFlags().asc_getMerge() == Asc.c_oAscMergeOptions.Merge) && (cellinfo.asc_getMerge() == Asc.c_oAscMergeOptions.Merge) &&
arrItems.push({ arrItems.push({
caption: me.menuUnmerge, caption: me.menuUnmerge,
event: 'unmerge' event: 'unmerge'