[SE mobile] Fix Bug 33985.

a21faafe · Julia Radzhabova · e22ce14d · a21faafe
Commit a21faafe authored Mar 24, 2017 by Julia Radzhabova
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js ...spreadsheeteditor/mobile/app/controller/DocumentHolder.js +2 -1

No files found.
--- a/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
+++ b/apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
@@ -278,12 +278,13 @@ define([
                                event: 'edit'
                            });

+                            (cellinfo.asc_getFlags().asc_getMerge() == Asc.c_oAscMergeOptions.None) &&
                            menuItems.push({
                                caption: me.menuMerge,
                                event: 'merge'
                            });

-                            cellinfo.asc_getFlags().asc_getMerge() &&
+                            (cellinfo.asc_getFlags().asc_getMerge() ==  Asc.c_oAscMergeOptions.Merged) &&
                            menuItems.push({
                                caption: me.menuUnmerge,
                                event: 'unmerge'