Commit 7d7f797b authored by Maxim Kadushkin's avatar Maxim Kadushkin

[SSE mobile] fix bug 33925

parent a4f8b781
...@@ -184,7 +184,33 @@ define([ ...@@ -184,7 +184,33 @@ define([
_initMenu: function (cellinfo) { _initMenu: function (cellinfo) {
var me = this; var me = this;
if ( this.api.isCellEdited ) { var iscellmenu, isrowmenu, iscolmenu, isallmenu, ischartmenu, isimagemenu, istextshapemenu, isshapemenu, istextchartmenu;
var iscelllocked = cellinfo.asc_getLocked(),
seltype = cellinfo.asc_getFlags().asc_getSelectionType();
switch (seltype) {
case Asc.c_oAscSelectionType.RangeCells: iscellmenu = true; break;
case Asc.c_oAscSelectionType.RangeRow: isrowmenu = true; break;
case Asc.c_oAscSelectionType.RangeCol: iscolmenu = true; break;
case Asc.c_oAscSelectionType.RangeMax: isallmenu = true; break;
case Asc.c_oAscSelectionType.RangeImage: isimagemenu = true; break;
case Asc.c_oAscSelectionType.RangeShape: isshapemenu = true; break;
case Asc.c_oAscSelectionType.RangeChart: ischartmenu = true; break;
case Asc.c_oAscSelectionType.RangeChartText: istextchartmenu = true; break;
case Asc.c_oAscSelectionType.RangeShapeText: istextshapemenu = true; break;
}
if (!iscelllocked && (isimagemenu || isshapemenu || ischartmenu || istextshapemenu || istextchartmenu)) {
this.api.asc_getGraphicObjectProps().every(function (object) {
if (object.asc_getObjectType() == Asc.c_oAscTypeSelectElement.Image) {
iscelllocked = object.asc_getObjectValue().asc_getLocked();
}
return !iscelllocked;
});
}
if ( iscelllocked || this.api.isCellEdited ) {
menuItems = [{ menuItems = [{
caption: me.menuCopy, caption: me.menuCopy,
event: 'copy' event: 'copy'
...@@ -200,24 +226,12 @@ define([ ...@@ -200,24 +226,12 @@ define([
},{ },{
caption: me.menuPaste, caption: me.menuPaste,
event: 'paste' event: 'paste'
},{
caption: me.menuDelete,
event: 'del'
}]; }];
var iscellmenu, isrowmenu, iscolmenu, isallmenu, ischartmenu, isimagemenu, istextshapemenu, isshapemenu, istextchartmenu, // isTableLocked = cellinfo.asc_getLockedTable()===true;
seltype = cellinfo.asc_getFlags().asc_getSelectionType(),
iscelllocked = cellinfo.asc_getLocked(),
isTableLocked = cellinfo.asc_getLockedTable()===true;
switch (seltype) {
case Asc.c_oAscSelectionType.RangeCells: iscellmenu = true; break;
case Asc.c_oAscSelectionType.RangeRow: isrowmenu = true; break;
case Asc.c_oAscSelectionType.RangeCol: iscolmenu = true; break;
case Asc.c_oAscSelectionType.RangeMax: isallmenu = true; break;
case Asc.c_oAscSelectionType.RangeImage: isimagemenu = true; break;
case Asc.c_oAscSelectionType.RangeShape: isshapemenu = true; break;
case Asc.c_oAscSelectionType.RangeChart: ischartmenu = true; break;
case Asc.c_oAscSelectionType.RangeChartText: istextchartmenu = true; break;
case Asc.c_oAscSelectionType.RangeShapeText: istextshapemenu = true; break;
}
if (isimagemenu || isshapemenu || ischartmenu || if (isimagemenu || isshapemenu || ischartmenu ||
istextshapemenu || istextchartmenu ) istextshapemenu || istextchartmenu )
...@@ -229,9 +243,6 @@ define([ ...@@ -229,9 +243,6 @@ define([
} else { } else {
if ( iscolmenu || isrowmenu) { if ( iscolmenu || isrowmenu) {
menuItems.push({ menuItems.push({
caption: me.menuDelete,
event: 'del'
},{
caption: me.menuHide, caption: me.menuHide,
event: 'hide' event: 'hide'
},{ },{
...@@ -240,11 +251,6 @@ define([ ...@@ -240,11 +251,6 @@ define([
}); });
} else } else
if ( iscellmenu ) { if ( iscellmenu ) {
menuItems.push({
caption: me.menuDelete,
event: 'del'
});
!iscelllocked && !iscelllocked &&
menuItems.push({ menuItems.push({
caption: me.menuCell, caption: me.menuCell,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment