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

Pranav Kant pranavk at collabora.co.uk
Thu Jan 12 10:25:21 UTC 2017


 loleaflet/dist/toolbar/toolbar.js |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit d1502fa918583f77926b0a2c49b7f183c3b6ab8d
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Thu Jan 12 15:49:57 2017 +0530

    loleaflet: Don't hide prev/next buttons for calc
    
    Primary reason we are bringing it back is because in mobile mode
    userlist icon goes to the right most edge of the screen which
    leads to userlist popup not being shown (which seems to be the
    bug in library we are using)
    
    Change-Id: Ie5b93c41f54ffeeb8615f90fa0e71c74de5ed92c
    (cherry picked from commit 83963d085739efbf2465952b6ec73782b12a80b5)
    Reviewed-on: https://gerrit.libreoffice.org/32988
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 332601a..84de90a 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1361,12 +1361,7 @@ map.on('updateparts pagenumberchanged', function (e) {
 		toolbar.hide('deletepage');
 	}
 
-	if (e.docType === 'spreadsheet') {
-		toolbar.hide('prev');
-		toolbar.hide('next');
-		toolbar.hide('prevnextbreak');
-	}
-	else {
+	if (e.docType !== 'spreadsheet') {
 		if (current === 0) {
 			toolbar.disable('prev');
 		}


More information about the Libreoffice-commits mailing list