[mobile] Bug 44415 (#343)

This commit is contained in:
JuliaSvinareva 2020-02-19 11:15:17 +03:00 committed by GitHub
parent 3d73ac4c48
commit 0a7edc3261
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 102 additions and 12 deletions

View file

@ -118,11 +118,35 @@ define([
var me = this; var me = this;
if ('cut' == eventName) { if ('cut' == eventName) {
me.api.Cut(); var res = me.api.Cut();
if (!res) {
_view.hideMenu();
uiApp.modal({
title: me.textCopyCutPasteActions,
text : me.errorCopyCutPaste,
buttons: [{text: 'OK'}]
});
}
} else if ('copy' == eventName) { } else if ('copy' == eventName) {
me.api.Copy(); var res = me.api.Copy();
if (!res) {
_view.hideMenu();
uiApp.modal({
title: me.textCopyCutPasteActions,
text : me.errorCopyCutPaste,
buttons: [{text: 'OK'}]
});
}
} else if ('paste' == eventName) { } else if ('paste' == eventName) {
me.api.Paste(); var res = me.api.Paste();
if (!res) {
_view.hideMenu();
uiApp.modal({
title: me.textCopyCutPasteActions,
text: me.errorCopyCutPaste,
buttons: [{text: 'OK'}]
});
}
} else if ('merge' == eventName) { } else if ('merge' == eventName) {
me.api.MergeCells(); me.api.MergeCells();
} else if ('split' == eventName) { } else if ('split' == eventName) {
@ -559,7 +583,9 @@ define([
menuMerge: 'Merge Cells', menuMerge: 'Merge Cells',
menuSplit: 'Split Cell', menuSplit: 'Split Cell',
menuDeleteTable: 'Delete Table', menuDeleteTable: 'Delete Table',
menuReviewChange: 'Review Change' menuReviewChange: 'Review Change',
textCopyCutPasteActions: 'Copy, Cut and Paste Actions',
errorCopyCutPaste: 'Copy, cut and paste actions using the context menu will be performed within the current file only. You cannot copy or paste to or from other applications.'
} }
})(), DE.Controllers.DocumentHolder || {})) })(), DE.Controllers.DocumentHolder || {}))
}); });

View file

@ -108,6 +108,8 @@
"DE.Controllers.DocumentHolder.textColumns": "Columns", "DE.Controllers.DocumentHolder.textColumns": "Columns",
"DE.Controllers.DocumentHolder.textGuest": "Guest", "DE.Controllers.DocumentHolder.textGuest": "Guest",
"DE.Controllers.DocumentHolder.textRows": "Rows", "DE.Controllers.DocumentHolder.textRows": "Rows",
"DE.Controllers.DocumentHolder.textCopyCutPasteActions": "Copy, Cut and Paste Actions",
"DE.Controllers.DocumentHolder.errorCopyCutPaste": "Copy, cut and paste actions using the context menu will be performed within the current file only. You cannot copy or paste to or from other applications.",
"DE.Controllers.EditContainer.textChart": "Chart", "DE.Controllers.EditContainer.textChart": "Chart",
"DE.Controllers.EditContainer.textFooter": "Footer", "DE.Controllers.EditContainer.textFooter": "Footer",
"DE.Controllers.EditContainer.textHeader": "Header", "DE.Controllers.EditContainer.textHeader": "Header",

View file

@ -104,11 +104,35 @@ define([
var me = this; var me = this;
if ('cut' == eventName) { if ('cut' == eventName) {
me.api.Cut(); var res = me.api.Cut();
if (!res) {
_view.hideMenu();
uiApp.modal({
title: me.textCopyCutPasteActions,
text : me.errorCopyCutPaste,
buttons: [{text: 'OK'}]
});
}
} else if ('copy' == eventName) { } else if ('copy' == eventName) {
me.api.Copy(); var res = me.api.Copy();
if (!res) {
_view.hideMenu();
uiApp.modal({
title: me.textCopyCutPasteActions,
text : me.errorCopyCutPaste,
buttons: [{text: 'OK'}]
});
}
} else if ('paste' == eventName) { } else if ('paste' == eventName) {
me.api.Paste(); var res = me.api.Paste();
if (!res) {
_view.hideMenu();
uiApp.modal({
title: me.textCopyCutPasteActions,
text: me.errorCopyCutPaste,
buttons: [{text: 'OK'}]
});
}
} else if ('delete' == eventName) { } else if ('delete' == eventName) {
me.api.asc_Remove(); me.api.asc_Remove();
} else if ('edit' == eventName) { } else if ('edit' == eventName) {
@ -329,7 +353,9 @@ define([
menuAddLink: 'Add Link', menuAddLink: 'Add Link',
menuOpenLink: 'Open Link', menuOpenLink: 'Open Link',
menuMore: 'More', menuMore: 'More',
sheetCancel: 'Cancel' sheetCancel: 'Cancel',
textCopyCutPasteActions: 'Copy, Cut and Paste Actions',
errorCopyCutPaste: 'Copy, cut and paste actions using the context menu will be performed within the current file only. You cannot copy or paste to or from other applications.'
} }
})(), PE.Controllers.DocumentHolder || {})) })(), PE.Controllers.DocumentHolder || {}))
}); });

View file

@ -39,6 +39,8 @@
"PE.Controllers.DocumentHolder.menuOpenLink": "Open Link", "PE.Controllers.DocumentHolder.menuOpenLink": "Open Link",
"PE.Controllers.DocumentHolder.menuPaste": "Paste", "PE.Controllers.DocumentHolder.menuPaste": "Paste",
"PE.Controllers.DocumentHolder.sheetCancel": "Cancel", "PE.Controllers.DocumentHolder.sheetCancel": "Cancel",
"PE.Controllers.DocumentHolder.textCopyCutPasteActions": "Copy, Cut and Paste Actions",
"PE.Controllers.DocumentHolder.errorCopyCutPaste": "Copy, cut and paste actions using the context menu will be performed within the current file only. You cannot copy or paste to or from other applications.",
"PE.Controllers.DocumentPreview.txtFinalMessage": "The end of slide preview. Click to exit.", "PE.Controllers.DocumentPreview.txtFinalMessage": "The end of slide preview. Click to exit.",
"PE.Controllers.EditContainer.textChart": "Chart", "PE.Controllers.EditContainer.textChart": "Chart",
"PE.Controllers.EditContainer.textHyperlink": "Hyperlink", "PE.Controllers.EditContainer.textHyperlink": "Hyperlink",

View file

@ -109,9 +109,39 @@ define([
var info = me.api.asc_getCellInfo(); var info = me.api.asc_getCellInfo();
switch (event) { switch (event) {
case 'cut': me.api.asc_Cut(); break; case 'cut':
case 'copy': me.api.asc_Copy(); break; var res = me.api.asc_Cut();
case 'paste': me.api.asc_Paste(); break; if (!res) {
me.view.hideMenu();
uiApp.modal({
title: me.textCopyCutPasteActions,
text : me.errorCopyCutPaste,
buttons: [{text: 'OK'}]
});
}
break;
case 'copy':
var res = me.api.asc_Copy();
if (!res) {
me.view.hideMenu();
uiApp.modal({
title: me.textCopyCutPasteActions,
text : me.errorCopyCutPaste,
buttons: [{text: 'OK'}]
});
}
break;
case 'paste':
var res = me.api.asc_Paste();
if (!res) {
me.view.hideMenu();
uiApp.modal({
title: me.textCopyCutPasteActions,
text: me.errorCopyCutPaste,
buttons: [{text: 'OK'}]
});
}
break;
case 'del': me.api.asc_emptyCells(Asc.c_oAscCleanOptions.All); break; case 'del': me.api.asc_emptyCells(Asc.c_oAscCleanOptions.All); break;
case 'wrap': me.api.asc_setCellTextWrap(true); break; case 'wrap': me.api.asc_setCellTextWrap(true); break;
case 'unwrap': me.api.asc_setCellTextWrap(false); break; case 'unwrap': me.api.asc_setCellTextWrap(false); break;
@ -390,7 +420,9 @@ define([
menuMore: 'More', menuMore: 'More',
sheetCancel: 'Cancel', sheetCancel: 'Cancel',
menuFreezePanes: 'Freeze Panes', menuFreezePanes: 'Freeze Panes',
menuUnfreezePanes: 'Unfreeze Panes' menuUnfreezePanes: 'Unfreeze Panes',
textCopyCutPasteActions: 'Copy, Cut and Paste Actions',
errorCopyCutPaste: 'Copy, cut and paste actions using the context menu will be performed within the current file only. You cannot copy or paste to or from other applications.'
} }
})(), SSE.Controllers.DocumentHolder || {})) })(), SSE.Controllers.DocumentHolder || {}))
}); });

View file

@ -42,6 +42,8 @@
"SSE.Controllers.DocumentHolder.menuWrap": "Wrap", "SSE.Controllers.DocumentHolder.menuWrap": "Wrap",
"SSE.Controllers.DocumentHolder.sheetCancel": "Cancel", "SSE.Controllers.DocumentHolder.sheetCancel": "Cancel",
"SSE.Controllers.DocumentHolder.warnMergeLostData": "Operation can destroy data in the selected cells.<br>Continue?", "SSE.Controllers.DocumentHolder.warnMergeLostData": "Operation can destroy data in the selected cells.<br>Continue?",
"SSE.Controllers.DocumentHolder.textCopyCutPasteActions": "Copy, Cut and Paste Actions",
"SSE.Controllers.DocumentHolder.errorCopyCutPaste": "Copy, cut and paste actions using the context menu will be performed within the current file only. You cannot copy or paste to or from other applications.",
"SSE.Controllers.EditCell.textAuto": "Auto", "SSE.Controllers.EditCell.textAuto": "Auto",
"SSE.Controllers.EditCell.textFonts": "Fonts", "SSE.Controllers.EditCell.textFonts": "Fonts",
"SSE.Controllers.EditCell.textPt": "pt", "SSE.Controllers.EditCell.textPt": "pt",