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

[SSE mobile] fix bug 33925

Browse source
This commit is contained in:
Maxim Kadushkin 2017-02-06 19:14:48 +03:00
parent a4f8b7810a
commit 7d7f797bf7
1 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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([
},{ },{
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([
} 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([
}); });
} 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,