[SSE mobile] Bug 37839

This commit is contained in:
Julia Svinareva 2020-02-03 14:28:33 +03:00
parent f4039727c3
commit 80237917d3

View file

@ -188,7 +188,7 @@ define([
}, },
onApiShowPopMenu: function(posX, posY) { onApiShowPopMenu: function(posX, posY) {
if ( !_isEdit || this.isDisconnected) return; if (this.isDisconnected) return;
if ($('.popover.settings, .popup.settings, .picker-modal.settings, .modal-in, .actions-modal').length > 0) { if ($('.popover.settings, .popup.settings, .picker-modal.settings, .modal-in, .actions-modal').length > 0) {
return; return;
@ -230,127 +230,138 @@ define([
case Asc.c_oAscSelectionType.RangeShapeText: istextshapemenu = true; break; case Asc.c_oAscSelectionType.RangeShapeText: istextshapemenu = true; break;
} }
if (!iscelllocked && (isimagemenu || isshapemenu || ischartmenu || istextshapemenu || istextchartmenu)) { if (!_isEdit) {
this.api.asc_getGraphicObjectProps().every(function (object) { if (iscellmenu || istextchartmenu || istextshapemenu) {
if (object.asc_getObjectType() == Asc.c_oAscTypeSelectElement.Image) { arrItemsIcon = [{
iscelllocked = object.asc_getObjectValue().asc_getLocked(); caption: me.menuCopy,
} event: 'copy',
icon: 'icon-copy'
}];
}
if (iscellmenu && cellinfo.asc_getHyperlink()) {
arrItems.push({
caption: me.menuOpenLink,
event: 'openlink'
});
}
} else {
return !iscelllocked; 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();
}
if ( iscelllocked || this.api.isCellEdited ) { return !iscelllocked;
arrItemsIcon = [{ });
}
if (iscelllocked || this.api.isCellEdited) {
arrItemsIcon = [{
caption: me.menuCopy, caption: me.menuCopy,
event: 'copy', event: 'copy',
icon: 'icon-copy' icon: 'icon-copy'
}]; }];
} else { } else {
var arrItemsIcon = [{ var arrItemsIcon = [{
caption: me.menuCut, caption: me.menuCut,
event: 'cut', event: 'cut',
icon: 'icon-cut' icon: 'icon-cut'
},{ }, {
caption: me.menuCopy, caption: me.menuCopy,
event: 'copy', event: 'copy',
icon: 'icon-copy' icon: 'icon-copy'
},{ }, {
caption: me.menuPaste, caption: me.menuPaste,
event: 'paste', event: 'paste',
icon: 'icon-paste' icon: 'icon-paste'
}]; }];
arrItems.push({ arrItems.push({
caption: me.menuDelete, caption: me.menuDelete,
event: 'del' event: 'del'
}); });
// isTableLocked = cellinfo.asc_getLockedTable()===true; // isTableLocked = cellinfo.asc_getLockedTable()===true;
if (isimagemenu || isshapemenu || ischartmenu || if (isimagemenu || isshapemenu || ischartmenu ||
istextshapemenu || istextchartmenu ) istextshapemenu || istextchartmenu) {
{
arrItems.push({
caption: me.menuEdit,
event: 'edit'
});
} else {
if ( iscolmenu || isrowmenu) {
arrItems.push({ arrItems.push({
caption: me.menuEdit,
event: 'edit'
});
} else {
if (iscolmenu || isrowmenu) {
arrItems.push({
caption: me.menuHide, caption: me.menuHide,
event: 'hide' event: 'hide'
},{ }, {
caption: me.menuShow, caption: me.menuShow,
event: 'show' event: 'show'
}); });
} else } else if (iscellmenu) {
if ( iscellmenu ) { !iscelllocked &&
!iscelllocked && arrItems.push({
arrItems.push({ caption: me.menuCell,
caption: me.menuCell, event: 'edit'
event: 'edit' });
});
(cellinfo.asc_getFlags().asc_getMerge() == Asc.c_oAscMergeOptions.None) && (cellinfo.asc_getFlags().asc_getMerge() == Asc.c_oAscMergeOptions.None) &&
arrItems.push({ arrItems.push({
caption: me.menuMerge, caption: me.menuMerge,
event: 'merge' event: 'merge'
}); });
(cellinfo.asc_getFlags().asc_getMerge() == Asc.c_oAscMergeOptions.Merge) && (cellinfo.asc_getFlags().asc_getMerge() == Asc.c_oAscMergeOptions.Merge) &&
arrItems.push({ arrItems.push({
caption: me.menuUnmerge, caption: me.menuUnmerge,
event: 'unmerge' event: 'unmerge'
}); });
arrItems.push( arrItems.push(
cellinfo.asc_getFlags().asc_getWrapText() ? cellinfo.asc_getFlags().asc_getWrapText() ?
{ {
caption: me.menuUnwrap, caption: me.menuUnwrap,
event: 'unwrap' event: 'unwrap'
} : } :
{ {
caption: me.menuWrap, caption: me.menuWrap,
event: 'wrap' event: 'wrap'
});
if (cellinfo.asc_getHyperlink() && !cellinfo.asc_getFlags().asc_getMultiselect() &&
cellinfo.asc_getHyperlink().asc_getType() == Asc.c_oAscHyperlinkType.WebLink) {
arrItems.push({
caption: me.menuOpenLink,
event: 'openlink'
}); });
} else if (!cellinfo.asc_getHyperlink() && !cellinfo.asc_getFlags().asc_getMultiselect() &&
if ( cellinfo.asc_getHyperlink() && !cellinfo.asc_getFlags().asc_getMultiselect() && !cellinfo.asc_getFlags().asc_getLockText() && !!cellinfo.asc_getText()) {
cellinfo.asc_getHyperlink().asc_getType() == Asc.c_oAscHyperlinkType.WebLink ) arrItems.push({
{ caption: me.menuAddLink,
arrItems.push({ event: 'addlink'
caption: me.menuOpenLink, });
event: 'openlink' }
});
} else
if ( !cellinfo.asc_getHyperlink() && !cellinfo.asc_getFlags().asc_getMultiselect() &&
!cellinfo.asc_getFlags().asc_getLockText() && !!cellinfo.asc_getText() )
{
arrItems.push({
caption: me.menuAddLink,
event: 'addlink'
});
} }
arrItems.push({
caption: this.api.asc_getSheetViewSettings().asc_getIsFreezePane() ? me.menuUnfreezePanes : me.menuFreezePanes,
event: 'freezePanes'
});
} }
arrItems.push({
caption: this.api.asc_getSheetViewSettings().asc_getIsFreezePane() ? me.menuUnfreezePanes : me.menuFreezePanes,
event: 'freezePanes'
});
} }
}
if (Common.SharedSettings.get('phone') && arrItems.length > 2) {
_actionSheets = arrItems.slice(2);
if (Common.SharedSettings.get('phone') && arrItems.length > 2) { arrItems = arrItems.slice(0, 2);
_actionSheets = arrItems.slice(2); arrItems.push({
caption: me.menuMore,
arrItems = arrItems.slice(0, 2); event: 'showActionSheet'
arrItems.push({ });
caption: me.menuMore, }
event: 'showActionSheet'
});
} }
var menuItems = {itemsIcon: arrItemsIcon, items: arrItems}; var menuItems = {itemsIcon: arrItemsIcon, items: arrItems};