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

[Libreoffice Gerrit user]

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

New commits:
commit 2f861612e9aac7e92722597f345a6ab4f4e00d02
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Thu May 23 15:38:45 2019 +0200
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Thu May 23 16:23:18 2019 +0200

    Some menubar folding/unfolding cleanups
    
    Change-Id: I4e5abe59076a5dbd41b1c8d002c0f3c4e53569de
    Reviewed-on: https://gerrit.libreoffice.org/72858
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/loleaflet/src/control/Control.Toolbar.js b/loleaflet/src/control/Control.Toolbar.js
index 791290b17..97f3b2694 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -1561,16 +1561,10 @@ function onDocLayerInit() {
 	statusbar.refresh();
 
 	if (window.mode.isTablet()) {
-		// 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.hideMenubar();
+
 		$('#document-container').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 a20738b96..30d81fa86 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -1466,8 +1466,8 @@ L.Map = L.Evented.extend({
 		}
 
 		var obj = $('.unfold');
-		obj.removeClass('w2ui-icon unfold');
-		obj.addClass('w2ui-icon fold');
+		obj.removeClass('unfold');
+		obj.addClass('fold');
 
 		moveObjectVertically($('#spreadsheet-row-column-frame'), 36);
 		moveObjectVertically($('#document-container'), 36);
@@ -1483,8 +1483,8 @@ L.Map = L.Evented.extend({
 		}
 
 		var obj = $('.fold');
-		obj.removeClass('w2ui-icon fold');
-		obj.addClass('w2ui-icon unfold');
+		obj.removeClass('fold');
+		obj.addClass('unfold');
 
 		moveObjectVertically($('#spreadsheet-row-column-frame'), -36);
 		moveObjectVertically($('#document-container'), -36);