[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - loleaflet/dist

Pranav Kant pranavk at collabora.co.uk
Mon Mar 27 01:17:18 UTC 2017


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

New commits:
commit d5807b5536f94e8f367cf5671f90bc91cfd6a9c4
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/35351
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 19b33ff6..159bcf58 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -791,7 +791,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',


More information about the Libreoffice-commits mailing list