[Libreoffice-commits] online.git: loleaflet/src

Michael Meeks (via logerrit) logerrit at kemper.freedesktop.org
Fri Mar 13 11:39:32 UTC 2020


 loleaflet/src/map/Clipboard.js |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit f657455a8fbd63d7d7faa333fd115378cac4556d
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Wed Mar 11 16:26:12 2020 +0000
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Mar 13 12:39:14 2020 +0100

    android/iOS: do a native copy/paste UNO command on native mobile.
    
    As used from the hamburger menu.
    
    Change-Id: I3ac3fc2fa7492d5bd3e04e550a282d60b5d56784
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90341
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index 315fa1e90..2a5056824 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -619,6 +619,11 @@ L.Clipboard = L.Class.extend({
 	// Pull UNO clipboard commands out from menus and normal user input.
 	// We try to massage and re-emit these, to get good security event / credentials.
 	filterExecCopyPaste: function(cmd) {
+		if (window.ThisIsAMobileApp) {
+			// We do native copy/paste in the iOS and Android cases
+			return false;
+		}
+
 		if (cmd === '.uno:Copy') {
 			this._execCopyCutPaste('copy');
 		} else if (cmd === '.uno:Cut') {


More information about the Libreoffice-commits mailing list