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

[Aron Budea (via logerrit)]

 loleaflet/src/control/Control.Toolbar.js |   10 ++++++++--
 loleaflet/src/map/Map.js                 |    8 ++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit db2ae7432ddc432e42811bb125bd0d5a39a4087e
Author:     Aron Budea <aron.budea at collabora.com>
AuthorDate: Tue Jan 28 02:21:29 2020 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue Jan 28 18:44:26 2020 +0100

    tdf#130223: Revert "Some menubar folding/unfolding cleanups"
    
    This reverts commit 2f861612e9aac7e92722597f345a6ab4f4e00d02,
    which caused the formula bar to be hidden, and rows to get
    misaligned on tablets.
    
    Change-Id: I14826fccb23283e3f7462eee7aeb43fb6d2eaeaa
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87568
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/src/control/Control.Toolbar.js b/loleaflet/src/control/Control.Toolbar.js
index 8bb1e3e05..80c4bd57f 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -1714,10 +1714,16 @@ function onDocLayerInit() {
 	}
 
 	if (!window.ThisIsTheiOSApp && window.mode.isTablet()) {
-		map.hideMenubar();
-
+		// Fold menubar by default
+		// FIXME: reuse toogleMenubar / use css
+		$('.main-nav').css({'display': 'none'});
+		$('#closebuttonwrapper').css({'display': 'none'});
+		var obj = $('.fold');
+		obj.removeClass('w2ui-icon fold');
+		obj.addClass('w2ui-icon unfold');
 		$(map.options.documentContainer).addClass('tablet');
 		$('#spreadsheet-row-column-frame').addClass('tablet');
+		$('#presentation-controls-wrapper').css({'top': '41px'});
 
 		$('#tb_editbar_item_fonts').css({'display': 'none'});
 		$('#tb_editbar_item_fontsizes').css({'display': 'none'});
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 45ab9273a..4ee77558e 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -1687,8 +1687,8 @@ L.Map = L.Evented.extend({
 		}
 
 		var obj = $('.unfold');
-		obj.removeClass('unfold');
-		obj.addClass('fold');
+		obj.removeClass('w2ui-icon unfold');
+		obj.addClass('w2ui-icon fold');
 
 		moveObjectVertically($('#spreadsheet-row-column-frame'), 36);
 		moveObjectVertically($(this.options.documentContainer), 36);
@@ -1705,8 +1705,8 @@ L.Map = L.Evented.extend({
 		}
 
 		var obj = $('.fold');
-		obj.removeClass('fold');
-		obj.addClass('unfold');
+		obj.removeClass('w2ui-icon fold');
+		obj.addClass('w2ui-icon unfold');
 
 		moveObjectVertically($('#spreadsheet-row-column-frame'), -36);
 		moveObjectVertically($(this.options.documentContainer), -36);