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

[Tor Lillqvist (via logerrit)]

 loleaflet/src/control/Control.Menubar.js   |    7 ++++---
 loleaflet/src/control/Control.StatusBar.js |    3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 70f4f8b92e44d361c78dd323e147d23abba8b308
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Apr 16 08:09:44 2020 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Apr 16 09:26:01 2020 +0200

    Don't show zoom controls on tablets, either
    
    On touch devices you use pinch gestures to zoom, not buttons or menus.
    Displaying the alleged zoom percentage is fairly pointless as it
    doesn't match physical paper size anyway.
    
    Change-Id: Ieccfa9b5454a3ac71b0c31f6ab38ed6696304cc5
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92332
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 919a4ab3f..8d77a6dc3 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -56,7 +56,8 @@ L.Control.Menubar = L.Control.extend({
 				]},
 				{uno: '.uno:EditStyle'}
 			]},
-			{name: _UNO('.uno:ViewMenu', 'text'), id: 'view', type: 'menu', menu: [
+			{name: _UNO('.uno:ViewMenu', 'text'), id: 'view', type: 'menu',
+			 menu: (window.mode.isTablet() ? [] : [
 				{name: _UNO('.uno:FullScreen', 'text'), id: 'fullscreen', type: 'action'},
 				{type: 'separator'},
 				{name: _UNO('.uno:ZoomPlus', 'text'), id: 'zoomin', type: 'action'},
@@ -64,13 +65,13 @@ L.Control.Menubar = L.Control.extend({
 				{name: _('Reset zoom'), id: 'zoomreset', type: 'action'},
 				{name: _('Show Ruler'), id: 'showruler', type: 'action'},
 				{type: 'separator'},
+			]).concat([
 				{uno: '.uno:ControlCodes'},
 				{type: 'separator'},
 				{name: _UNO('.uno:ShowResolvedAnnotations', 'text'), id: 'showresolved', type: 'action'},
 				{type: 'separator'},
 				{uno: '.uno:Sidebar'},
-			]
-			},
+			])},
 			{name: _UNO('.uno:InsertMenu', 'text'), id: 'insert', type: 'menu', menu: [
 				{name: _('Local Image...'), id: 'insertgraphic', type: 'action'},
 				{name: _UNO('.uno:InsertGraphic', 'text'), id: 'insertgraphicremote', type: 'action'},
diff --git a/loleaflet/src/control/Control.StatusBar.js b/loleaflet/src/control/Control.StatusBar.js
index 26db62d11..ed5eb0353 100644
--- a/loleaflet/src/control/Control.StatusBar.js
+++ b/loleaflet/src/control/Control.StatusBar.js
@@ -186,6 +186,7 @@ L.Control.StatusBar = L.Control.extend({
 					{type: 'button',  id: 'prev', img: 'prev', hint: _UNO('.uno:PageUp', 'text')},
 					{type: 'button',  id: 'next', img: 'next', hint: _UNO('.uno:PageDown', 'text')},
 					{type: 'break', id: 'prevnextbreak'},
+				].concat(window.mode.isTablet() ? [] : [
 					{type: 'button',  id: 'zoomreset', img: 'zoomreset', hint: _('Reset zoom')},
 					{type: 'button',  id: 'zoomout', img: 'zoomout', hint: _UNO('.uno:ZoomMinus')},
 					{type: 'menu-radio', id: 'zoom', text: '100',
@@ -210,7 +211,7 @@ L.Control.StatusBar = L.Control.extend({
 						]
 					},
 					{type: 'button',  id: 'zoomin', img: 'zoomin', hint: _UNO('.uno:ZoomPlus')}
-				],
+				]),
 				onClick: function (e) {
 					that.hideTooltip(this, e.target);
 					that.onClick(e, e.target, e.item, e.subItem);