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

ozturkemre ozturkemry at gmail.com
Thu Apr 5 08:52:32 UTC 2018


 loleaflet/dist/spreadsheet.css    |    2 +-
 loleaflet/dist/toolbar/toolbar.js |   11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 6bf3efe7cb91dec2b8df2525952eb2516bbf9a72
Author: ozturkemre <ozturkemry at gmail.com>
Date:   Thu Feb 1 02:43:15 2018 +0300

    tdf#113142 added insert sheet to the sheet list
    
    Change-Id: I7ec6a45bf7bc4e2daf545ab4f234c3a0c9fcbded
    Reviewed-on: https://gerrit.libreoffice.org/49070
    Reviewed-by: pranavk <pranavk at collabora.co.uk>
    Tested-by: pranavk <pranavk at collabora.co.uk>
    Reviewed-on: https://gerrit.libreoffice.org/52306
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/dist/spreadsheet.css b/loleaflet/dist/spreadsheet.css
index 4385afa6b..01f0b0bd2 100644
--- a/loleaflet/dist/spreadsheet.css
+++ b/loleaflet/dist/spreadsheet.css
@@ -12,7 +12,7 @@
 .spreadsheet-tabs-container {
 	margin: 0;
 	padding: 0;
-	left: 132px;
+	left: 162px;
 	right: 0;
 	bottom: 33px;
 	position: absolute;
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index f7c018395..fe89fc4c2 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -284,9 +284,12 @@ function onClick(id, item, subItem) {
 		$('#spreadsheet-tab-scroll').scrollLeft($('#spreadsheet-tab-scroll').scrollLeft() + 60);
 	}
 	else if (id === 'prevrecord') {
-		$('#spreadsheet-tab-scroll').scrollLeft($('#spreadsheet-tab-scroll').scrollLeft() - 60);
+		$('#spreadsheet-tab-scroll').scrollLeft($('#spreadsheet-tab-scroll').scrollLeft() - 30);
 	}
 	else if (id === 'lastrecord') {
+		$('#spreadsheet-tab-scroll').scrollLeft($('#spreadsheet-tab-scroll').scrollLeft() + 120);
+	}
+	else if (id === 'insertpage') {
 		$('#spreadsheet-tab-scroll').scrollLeft($('#spreadsheet-tab-scroll').prop('scrollWidth'));
 	}
 	else if (id === 'insertgraphic') {
@@ -624,7 +627,8 @@ $(function () {
 			{type: 'button',  id: 'firstrecord',  img: 'firstrecord', hidden: true, hint: _('First sheet')},
 			{type: 'button',  id: 'prevrecord',  img: 'prevrecord', hidden: true, hint: _('Previous sheet')},
 			{type: 'button',  id: 'nextrecord',  img: 'nextrecord', hidden: true, hint: _('Next sheet')},
-			{type: 'button',  id: 'lastrecord',  img: 'lastrecord', hidden: true, hint: _('Last sheet')}
+			{type: 'button',  id: 'lastrecord',  img: 'lastrecord', hidden: true, hint: _('Last sheet')},
+			{type: 'button',  id: 'insertpage', img: 'insertpage', hidden:true, hint: _('Insert sheet')}
 		],
 		onClick: function (e) {
 			onClick(e.target);
@@ -1529,6 +1533,7 @@ map.on('updateparts pagenumberchanged', function (e) {
 		toolbar.show('nextrecord');
 		toolbar.show('prevrecord');
 		toolbar.show('lastrecord');
+		toolbar.show('insertpage');
 	}
 });
 
@@ -1601,7 +1606,7 @@ map.on('updatepermission', function (e) {
 		}
 	}
 
-	var spreadsheetButtons = ['firstrecord', 'prevrecord', 'nextrecord', 'lastrecord'];
+	var spreadsheetButtons = ['firstrecord', 'prevrecord', 'nextrecord', 'lastrecord', 'insertpage'];
 	var formulaBarButtons = ['sum', 'function'];
 	var presentationButtons = ['insertpage', 'duplicatepage', 'deletepage'];
 	var toolbarDownButtons = ['next', 'prev'];


More information about the Libreoffice-commits mailing list