[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-0' - loleaflet/src

Ashod Nakashian (via logerrit) logerrit at kemper.freedesktop.org
Thu Dec 12 12:25:00 UTC 2019


 loleaflet/src/control/Control.MobileWizard.js |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d4903eca646120e3590c7f60c4d02963d99c238d
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Thu Dec 12 07:19:02 2019 -0500
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Dec 12 13:24:43 2019 +0100

    leaflet: menu mobileWizard calls are not sidebar
    
    This fixes long-press context-menus on mobile.
    
    Change-Id: I63df610a12a075753a277a4257d6e7c785473107
    Reviewed-on: https://gerrit.libreoffice.org/85048
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit 7a2efacc11cbb1084a5e86782acf0a0d0440fddb)
    Reviewed-on: https://gerrit.libreoffice.org/85049

diff --git a/loleaflet/src/control/Control.MobileWizard.js b/loleaflet/src/control/Control.MobileWizard.js
index 4b8982d50..f5aa7c767 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -234,7 +234,8 @@ L.Control.MobileWizard = L.Control.extend({
 	_onMobileWizard: function(data) {
 		if (data) {
 			var isSidebar = data.id !== 'insert' && data.id !== 'menubar'
-				&& data.id !== 'insertshape' && data.id !== 'funclist';
+				&& data.id !== 'insertshape' && data.id !== 'funclist'
+				&& data.executionType !== 'menu';
 
 			if (!this._isActive && isSidebar) {
 				if (this.map.showSidebar == false)


More information about the Libreoffice-commits mailing list