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

[Pranav Kant]

 loleaflet/dist/toolbar/toolbar.js |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ae413830499a5854d9f9dd1a2e91859499a7ad3f
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Mon Dec 5 15:07:27 2016 +0530

    loleaflet: Disable zoom controls in spreadsheets, don't remove
    
    Due to a bug in w2ui library, w2overlay doesn't popup when it is
    near the edge of the screen (reproduceable only when no. of users
    are greater than 3). Lets disable zoom controls in case of
    spreadsheets so that userlist is not near the edge of the screen,
    and hence pops up.
    
    Change-Id: I6f2647d124484235afe6c92da18be38ed8e2b9ce
    Reviewed-on: https://gerrit.libreoffice.org/31622
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index e67343d..bd8fd10 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -745,7 +745,7 @@ map.on('doclayerinit', function () {
 	case 'spreadsheet':
 		toolbarUp.remove('inserttable', 'styles', 'alignblock', 'bullet', 'numbering', 'break-numbering');
 		toolbarUpMore.remove('inserttable', 'styles', 'alignblock', 'bullet', 'numbering', 'break-numbering');
-		statusbar.remove('zoomreset', 'zoomout', 'zoomin', 'zoomlevel');
+		statusbar.disable('zoomreset', 'zoomout', 'zoomin', 'zoomlevel');
 		statusbar.insert('left', [
 			{type: 'break', id:'break1'},
 			{type: 'html',  id: 'StatusDocPos',