[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loleaflet/dist loleaflet/src

[Andras Timar]

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

New commits:
commit 4414d31eb5054137ed18b418df7de21726c0da04
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Oct 31 14:45:04 2016 +0100

    loleaflet: hide zoom controls for spreadsheets
    
    (cherry picked from commit d589618bc1c6c73b5fa1711504ca6dcadb0cbe6b)
    (cherry picked from commit 760c1e732aae9014ce89227e361830d16b3df5bc)

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 54eaf65..b9cf84f 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -734,6 +734,10 @@ map.on('doclayerinit', function () {
 	var statusbar = w2ui['toolbar-down'];
 	switch (docType) {
 	case 'spreadsheet':
+		statusbar.hide('zoomreset');
+		statusbar.hide('zoomout');
+		statusbar.hide('zoomin');
+		statusbar.hide('zoomlevel');
 		statusbar.insert('left', [
 			{type: 'break', id:'break1'},
 			{type: 'html',  id: 'StatusDocPos',
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 9f6e806..360835b 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -128,12 +128,7 @@ L.Control.Menubar = L.Control.extend({
 												  {name: _('Row'), type: 'unocommand', uno: '.uno:InsertRows'},
 												  {name: _('Column'), type: 'unocommand', uno: '.uno:InsertColumns'}]
 			},
-			{name: _('View'), type: 'menu', menu: [{name: _('Full screen'), id: 'fullscreen', type: 'action'},
-												{type: 'separator'},
-												{name: _('Zoom in'), id: 'zoomin', type: 'action'},
-												{name: _('Zoom out'), id: 'zoomout', type: 'action'},
-												{name: _('Reset zoom'), id: 'zoomreset', type: 'action'}]
-			},
+			{name: _('View'), type: 'menu', menu: [{name: _('Full screen'), id: 'fullscreen', type: 'action'}]},
 			{name: _('Cells'), type: 'menu', menu: [{name: _('Insert row'), type: 'unocommand', uno: '.uno:InsertRows'},
 												 {name: _('Insert column'), type: 'unocommand', uno: '.uno:InsertColumns'},
 												 {type: 'separator'},