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

[Tamás Zolnai (via logerrit)]

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

New commits:
commit 5f28613c4820b359ce9f2a2a148edc7959e67cba
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Thu Oct 3 16:00:58 2019 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Thu Oct 3 16:18:13 2019 +0200

    mobile-wizard: Don't focus the document for mobile wizard toolbar button
    
    It's not a good idea to trigger keyboard when we try to
    open the mobile wizard.
    
    Change-Id: Ib1dd4daf5689695992904c98ef597ba8d9caed75

diff --git a/loleaflet/src/control/Control.Toolbar.js b/loleaflet/src/control/Control.Toolbar.js
index 00e99b4b3..c38f57045 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -122,7 +122,7 @@ function onClick(e, id, item, subItem) {
 	}
 	var docLayer = map._docLayer;
 	// In the iOS app we don't want clicking on the toolbar to pop up the keyboard.
-	if (!window.ThisIsTheiOSApp && id !== 'zoomin' && id !== 'zoomout') {
+	if (!window.ThisIsTheiOSApp && id !== 'zoomin' && id !== 'zoomout' && id !== 'mobile_wizard') {
 		map.focus();
 	}
 	if (item.disabled) {
commit 2d63070796e90b35e4ca3e72189c39e83915d9a1
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Thu Oct 3 15:49:37 2019 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Thu Oct 3 16:11:12 2019 +0200

    mobile-wizard: Correctly close the mobile wizard by level up
    
    We need to set window.mobileWizard to false and also need to
    send a sidebar message to close the sidebar entirelly.
    
    Change-Id: I897e63391a2aafd8a3f38f7ddb7b5bd14bb7a1cd

diff --git a/loleaflet/src/control/Control.MobileWizard.js b/loleaflet/src/control/Control.MobileWizard.js
index d5df7e8c8..382868854 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -68,6 +68,8 @@ L.Control.MobileWizard = L.Control.extend({
 		if (this._inMainMenu) {
 			this._hideWizard();
 			this._currentDepth = 0;
+			window.mobileWizard = false
+			this.map.sendUnoCommand('.uno:Sidebar');
 		} else {
 			this._currentDepth--;