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

fix bug 34567

Browse source
This commit is contained in:
Alexander.Trofimov 2017-03-27 19:01:22 +03:00
parent 6019ee19e0
commit 145731be9d
3 changed files with 5 additions and 5 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

@ -608,7 +608,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_getFlags().asc_getMerge();
if ((merged !== Asc.c_oAscMergeOptions.Merged) && 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,
buttons: ['yes', 'no'], buttons: ['yes', 'no'],
@ -1940,7 +1940,7 @@ define([
val = info.asc_getFlags().asc_getMerge(); val = info.asc_getFlags().asc_getMerge();
if (this._state.merge !== val) { if (this._state.merge !== val) {
toolbar.btnMerge.toggle(val===Asc.c_oAscMergeOptions.Merged, true); toolbar.btnMerge.toggle(val===Asc.c_oAscMergeOptions.Merge, true);
this._state.merge = val; this._state.merge = val;
} }

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

@ -392,7 +392,7 @@ define([
}, },
{ {
caption : me.txtUnmerge, caption : me.txtUnmerge,
value : Asc.c_oAscMergeOptions.Unmerge value : Asc.c_oAscMergeOptions.None
} }
] ]
}) })

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

@ -127,7 +127,7 @@ define([
} }
break; break;
case 'unmerge': case 'unmerge':
me.api.asc_mergeCells(Asc.c_oAscMergeOptions.Unmerge); me.api.asc_mergeCells(Asc.c_oAscMergeOptions.None);
break; break;
case 'hide': case 'hide':
me.api[info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeRow ? 'asc_hideRows' : 'asc_hideColumns'](); me.api[info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeRow ? 'asc_hideRows' : 'asc_hideColumns']();
@ -284,7 +284,7 @@ define([
event: 'merge' event: 'merge'
}); });
(cellinfo.asc_getFlags().asc_getMerge() == Asc.c_oAscMergeOptions.Merged) && (cellinfo.asc_getFlags().asc_getMerge() == Asc.c_oAscMergeOptions.Merge) &&
menuItems.push({ menuItems.push({
caption: me.menuUnmerge, caption: me.menuUnmerge,
event: 'unmerge' event: 'unmerge'