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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Mar 5 13:05:38 UTC 2019


 loleaflet/js/toolbar.js |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

New commits:
commit fcabb821bebd6bea226befd2e9a6c8193d3bdb1d
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Tue Jan 15 16:17:03 2019 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Tue Mar 5 09:04:51 2019 -0400

    loleaflet: move toolItems variable to initNormalToolbar function
    
    Change-Id: I8dda1cecf66a4c720c110fe146cd058570ee158d

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index ecabe1bb4..4188d67a9 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -666,6 +666,16 @@ var fontsizesSelectValue;
 // mobilebrowser:false means hide it for normal Online used from a mobile browser, but don't hide it in a mobile app
 
 function createToolbar() {
+
+	if (_inMobileMode()) {
+		$('#mobile-edit-button').show();
+	} else {
+		$('#toolbar-down').show();
+		initNormalToolbar();
+	}
+}
+
+function initNormalToolbar() {
 	var toolItems = [
 		{type: 'button',  id: 'closemobile',  img: 'closemobile', desktop: false, mobile: false, tablet: true, hidden: true},
 		{type: 'button',  id: 'save', img: 'save', hint: _UNO('.uno:Save')},
@@ -814,15 +824,6 @@ function createToolbar() {
 		{type: 'button',  id: 'hamburger-tablet',  img: 'hamburger', desktop: false, mobile: false, tablet: true, hidden: true}
 	];
 
-	if (_inMobileMode()) {
-		$('#mobile-edit-button').show();
-	} else {
-		$('#toolbar-down').show();
-		initNormalToolbar(toolItems);
-	}
-}
-
-function initNormalToolbar(toolItems) {
 	var toolbar = $('#toolbar-up');
 	toolbar.w2toolbar({
 		name: 'editbar',


More information about the Libreoffice-commits mailing list