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

[Andras Timar]

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

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

    disable zoom for Calc

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index b8d8218..2ef5ccb 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -754,6 +754,9 @@ map.on('doclayerinit', function () {
 	var statusbar = w2ui['toolbar-down'];
 	switch (docType) {
 	case 'spreadsheet':
+		statusbar.disable('zoomreset');
+		statusbar.disable('zoomout');
+		statusbar.disable('zoomin');
 		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 ed3fb85..c44f6cd 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -208,12 +208,7 @@ L.Control.Menubar = L.Control.extend({
 												{type: 'separator'},
 												{name: _('Select all'), type: 'unocommand', uno: '.uno:SelectAll'}]
 			},
-			{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: _('Insert'), type: 'menu', menu: [{name: _('Image'), id: 'insertgraphic', type: 'action'},
 												  {name: _('Comment'), type: 'unocommand', uno: '.uno:InsertAnnotation'},
 												  {type: 'separator'},