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

[Tamás Zolnai (via logerrit)]

 loleaflet/src/control/Control.MobileWizard.js |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 2d3cfba22fe6a95c8ce7bc8a6e28b43b3cf0d536
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon Oct 14 15:15:36 2019 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Mon Oct 14 15:15:42 2019 +0200

    menu-to-mobile-wizard: Fix menu panel height
    
    Change-Id: If3a453ebaa75717cc2fb9f195b56c0bf5c6ade17

diff --git a/loleaflet/src/control/Control.MobileWizard.js b/loleaflet/src/control/Control.MobileWizard.js
index 3b652aa6f..ac27f778a 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -155,8 +155,11 @@ L.Control.MobileWizard = L.Control.extend({
 			this._setTitle(this._mainTitle);
 
 			if (data.id === 'menubar') {
-				var newHeight = $(window).height() - $('#toolbar-wrapper').height() - 2;
-				$('#mobile-wizard').height(newHeight);
+				$('#mobile-wizard').height('100%');
+				if (this.map .getDocType() === 'spreadsheet')
+					$('#mobile-wizard').css('top', $('#spreadsheet-row-column-frame').css('top'));
+				else
+					$('#mobile-wizard').css('top', $('#document-container').css('top'));
 			} else {
 				$('#mobile-wizard').height('45%');
 			}
commit 9810a905a2e9f39c235997cafadde7af64ac8d03
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon Oct 14 14:59:57 2019 +0200
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Mon Oct 14 15:15:42 2019 +0200

    Fix title for mobile wizard
    
    Change-Id: I0c22b4a550d8cabdc72a8b7f843bb4b14caefc2b

diff --git a/loleaflet/src/control/Control.MobileWizard.js b/loleaflet/src/control/Control.MobileWizard.js
index 828dbafeb..3b652aa6f 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -151,10 +151,8 @@ L.Control.MobileWizard = L.Control.extend({
 
 			L.control.jsDialogBuilder({mobileWizard: this, map: this.map}).build(this.content.get(0), [data]);
 
-			if (data.id === 'insert') {
-				this._mainTitle = data.text ? data.text : '';
-				this._setTitle(this._mainTitle);
-			}
+			this._mainTitle = data.text ? data.text : '';
+			this._setTitle(this._mainTitle);
 
 			if (data.id === 'menubar') {
 				var newHeight = $(window).height() - $('#toolbar-wrapper').height() - 2;