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

[Tor Lillqvist (via logerrit)]

 loleaflet/src/control/Control.Menubar.js |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit e70975500be80e9d82bc840dc8d92d48875b397e
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Mar 13 13:36:34 2020 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Mar 13 13:23:14 2020 +0100

    Actually make the copy/paste menu commands work in the iOS app (and Android?)
    
    Change-Id: I472a9c7c2a192f068dedbfa2f9409afd3767ba90
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90462
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index b90f9f75b..a66321bbb 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -1085,7 +1085,7 @@ L.Control.Menubar = L.Control.extend({
 	},
 
 	_executeAction: function(itNode, itWizard) {
-		var id, data;
+		var id, mobileappuno, data;
 		if (itNode === undefined)
 		{ // called from JSDialogBuilder
 			id = itWizard.id;
@@ -1094,6 +1094,7 @@ L.Control.Menubar = L.Control.extend({
 		else
 		{ // called from
 			id = $(itNode).data('id');
+			mobileappuno = $(itNode).data('mobileappuno');
 			data = $(itNode).data;
 		}
 
@@ -1208,8 +1209,8 @@ L.Control.Menubar = L.Control.extend({
 					self._map.focus();
 				}
 			});
-		} else if (window.ThisIsAMobileApp && data('mobileappuno')) {
-			this._map.sendUnoCommand(data('mobileappuno'));
+		} else if (window.ThisIsAMobileApp && mobileappuno) {
+			this._map.sendUnoCommand(mobileappuno);
 		}
 		// Inform the host if asked
 		if (data('postmessage') === 'true') {