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

[Tor Lillqvist (via logerrit)]

 loleaflet/src/control/Control.Menubar.js |   21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

New commits:
commit 908c4229641c11ef4410f95c53229de721b8c52d
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Nov 20 17:15:24 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Nov 20 17:21:15 2019 +0100

    Add the mobileappuno things to the "non-mobile" menu too
    
    ("Mobile" here means "mobile phone", and the mobile apps run on
    non-phone devices (tablets) too.)
    
    Also propagate the mobileappuno thing in _createMenu.
    
    Sadly this is not enough to make the clipboard functionality work in
    the iOS app when built from core:cp-6+2 + online:master, though.
    
    Change-Id: I3fb5a643981780479679f252ec8927f49d2f4f48
    Reviewed-on: https://gerrit.libreoffice.org/83327
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index f02a10f51..b5cf4a40b 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -36,9 +36,9 @@ L.Control.Menubar = L.Control.extend({
 				{uno: '.uno:Redo'},
 				{name: _('Repair'), id: 'repair',  type: 'action'},
 				{type: 'separator'},
-				{name: _UNO('.uno:Cut'), id: 'warn-copy-paste',  type: 'action'},
-				{name: _UNO('.uno:Copy'), id: 'warn-copy-paste',  type: 'action'},
-				{name: _UNO('.uno:Paste'), id: 'warn-copy-paste',  type: 'action'},
+				{name: _UNO('.uno:Cut'), id: 'warn-copy-paste',  type: 'action', mobileappuno: '.uno:Cut'},
+				{name: _UNO('.uno:Copy'), id: 'warn-copy-paste',  type: 'action', mobileappuno: '.uno:Copy'},
+				{name: _UNO('.uno:Paste'), id: 'warn-copy-paste',  type: 'action', mobileappuno: '.uno:Paste'},
 				{uno: '.uno:SelectAll'},
 				{type: 'separator'},
 				{uno: '.uno:SearchDialog'},
@@ -263,9 +263,9 @@ L.Control.Menubar = L.Control.extend({
 				{uno: '.uno:Redo'},
 				{name: _('Repair'), id: 'repair',  type: 'action'},
 				{type: 'separator'},
-				{name: _UNO('.uno:Cut'), id: 'warn-copy-paste',  type: 'action'},
-				{name: _UNO('.uno:Copy'), id: 'warn-copy-paste',  type: 'action'},
-				{name: _UNO('.uno:Paste'), id: 'warn-copy-paste',  type: 'action'},
+				{name: _UNO('.uno:Cut'), id: 'warn-copy-paste',  type: 'action', mobileappuno: '.uno:Cut'},
+				{name: _UNO('.uno:Copy'), id: 'warn-copy-paste',  type: 'action', mobileappuno: '.uno:Copy'},
+				{name: _UNO('.uno:Paste'), id: 'warn-copy-paste',  type: 'action', mobileappuno: '.uno:Paste'},
 				{uno: '.uno:SelectAll'},
 				{type: 'separator'},
 				{uno: '.uno:SearchDialog'}
@@ -362,9 +362,9 @@ L.Control.Menubar = L.Control.extend({
 				{uno: '.uno:Redo'},
 				{name: _('Repair'), id: 'repair',  type: 'action'},
 				{type: 'separator'},
-				{name: _UNO('.uno:Cut'), id: 'warn-copy-paste',  type: 'action'},
-				{name: _UNO('.uno:Copy'), id: 'warn-copy-paste',  type: 'action'},
-				{name: _UNO('.uno:Paste'), id: 'warn-copy-paste',  type: 'action'},
+				{name: _UNO('.uno:Cut'), id: 'warn-copy-paste',  type: 'action', mobileappuno: '.uno:Cut'},
+				{name: _UNO('.uno:Copy'), id: 'warn-copy-paste',  type: 'action', mobileappuno: '.uno:Copy'},
+				{name: _UNO('.uno:Paste'), id: 'warn-copy-paste',  type: 'action', mobileappuno: '.uno:Paste'},
 				{uno: '.uno:SelectAll'},
 				{type: 'separator'},
 				{uno: '.uno:SearchDialog'}
@@ -1334,6 +1334,9 @@ L.Control.Menubar = L.Control.extend({
 			} else if (menu[i].type === 'action') {
 				$(aItem).data('type', 'action');
 				$(aItem).data('id', menu[i].id);
+				if (window.ThisIsAMobileApp && menu[i].mobileappuno) {
+					$(aItem).data('mobileappuno', menu[i].mobileappuno);
+				}
 			}
 
 			if (menu[i].tablet == false && window.mode.isTablet()) {