pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-26 22:42:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

[SSE] For bug 33985.

Browse Source
This commit is contained in:
Julia Radzhabova
2017-03-24 17:05:18 +03:00
parent 81b2d41dcb
commit e22ce14d9c
1 changed files with 2 additions and 2 deletions
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) {
var merged = me.api.asc_getCellInfo().asc_getFlags().asc_getMerge();
if (!merged && me.api.asc_mergeCellsDataLost(item.value)) {
if ((merged !== Asc.c_oAscMergeOptions.Merged) && me.api.asc_mergeCellsDataLost(item.value)) {
Common.UI.warning({
msg: me.warnMergeLostData,
buttons: ['yes', 'no'],
@ -1940,7 +1940,7 @@ define([
val = info.asc_getFlags().asc_getMerge();
if (this._state.merge !== val) {
toolbar.btnMerge.toggle(val===true, true);
toolbar.btnMerge.toggle(val===Asc.c_oAscMergeOptions.Merged, true);
this._state.merge = val;
}