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

[SSE mobile] Bug 37839

Browse source
This commit is contained in:
Julia Svinareva 2020-02-03 14:28:33 +03:00
parent f4039727c3
commit 80237917d3
1 changed files with 97 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
apps/spreadsheeteditor/mobile/app/controller/DocumentHolder.js
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,6 +230,22 @@ define([
case Asc.c_oAscSelectionType.RangeShapeText: istextshapemenu = true; break; case Asc.c_oAscSelectionType.RangeShapeText: istextshapemenu = true; break;
} }
if (!_isEdit) {
if (iscellmenu || istextchartmenu || istextshapemenu) {
arrItemsIcon = [{
caption: me.menuCopy,
event: 'copy',
icon: 'icon-copy'
}];
}
if (iscellmenu && cellinfo.asc_getHyperlink()) {
arrItems.push({
caption: me.menuOpenLink,
event: 'openlink'
});
}
} else {
if (!iscelllocked && (isimagemenu || isshapemenu || ischartmenu || istextshapemenu || istextchartmenu)) { if (!iscelllocked && (isimagemenu || isshapemenu || ischartmenu || istextshapemenu || istextchartmenu)) {
this.api.asc_getGraphicObjectProps().every(function (object) { this.api.asc_getGraphicObjectProps().every(function (object) {
if (object.asc_getObjectType() == Asc.c_oAscTypeSelectElement.Image) { if (object.asc_getObjectType() == Asc.c_oAscTypeSelectElement.Image) {
@ -269,8 +285,7 @@ define([
// isTableLocked = cellinfo.asc_getLockedTable()===true; // isTableLocked = cellinfo.asc_getLockedTable()===true;
if (isimagemenu || isshapemenu || ischartmenu || if (isimagemenu || isshapemenu || ischartmenu ||
istextshapemenu || istextchartmenu ) istextshapemenu || istextchartmenu) {
{
arrItems.push({ arrItems.push({
caption: me.menuEdit, caption: me.menuEdit,
event: 'edit' event: 'edit'
@ -284,8 +299,7 @@ define([
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,
@ -316,16 +330,13 @@ define([
}); });
if (cellinfo.asc_getHyperlink() && !cellinfo.asc_getFlags().asc_getMultiselect() && if (cellinfo.asc_getHyperlink() && !cellinfo.asc_getFlags().asc_getMultiselect() &&
cellinfo.asc_getHyperlink().asc_getType() == Asc.c_oAscHyperlinkType.WebLink ) cellinfo.asc_getHyperlink().asc_getType() == Asc.c_oAscHyperlinkType.WebLink) {
{
arrItems.push({ arrItems.push({
caption: me.menuOpenLink, caption: me.menuOpenLink,
event: 'openlink' event: 'openlink'
}); });
} else } 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_getFlags().asc_getLockText() && !!cellinfo.asc_getText() )
{
arrItems.push({ arrItems.push({
caption: me.menuAddLink, caption: me.menuAddLink,
event: 'addlink' event: 'addlink'
@ -342,7 +353,6 @@ define([
} }
if (Common.SharedSettings.get('phone') && arrItems.length > 2) { if (Common.SharedSettings.get('phone') && arrItems.length > 2) {
_actionSheets = arrItems.slice(2); _actionSheets = arrItems.slice(2);
@ -352,6 +362,7 @@ define([
event: 'showActionSheet' event: 'showActionSheet'
}); });
} }
}
var menuItems = {itemsIcon: arrItemsIcon, items: arrItems}; var menuItems = {itemsIcon: arrItemsIcon, items: arrItems};