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

[Pranav Kant]

 loleaflet/dist/partsPreviewControl.css |    6 +++---
 loleaflet/dist/toolbar/toolbar.js      |   20 ++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit 551352e37960c2c720cf368d038e00c8906c44bf
Author: Pranav Kant <pranavk at collabora.com>
Date:   Fri Apr 29 12:38:48 2016 +0530

    bccu#1583: Make scrollbar visible for Impress docs
    
    We use 180x180 px as thumbnail size, and 2px border for selected
    thumbnail on top of that which makes its 184x180.
    .parts-preview needs to be expanded to 214px for
    mCustomScrollbar to work properly without hiding any thumbnails
    including borders. With all of this, we also need to shift
    impress document offset to 214px from left to make all things fit
    nicely.
    
    Change-Id: I446918403cd43fe61f0ebfb358e6a2051014b28a

diff --git a/loleaflet/dist/partsPreviewControl.css b/loleaflet/dist/partsPreviewControl.css
index 7e638ef..78ef960 100644
--- a/loleaflet/dist/partsPreviewControl.css
+++ b/loleaflet/dist/partsPreviewControl.css
@@ -1,5 +1,5 @@
 .parts-preview-document {
-	left: 195px !important;
+	left: 214px !important;
 }
 
 .parts-preview {
@@ -8,7 +8,7 @@
 	top: 47px;
 	left: 0px;
 	bottom: 29px;
-	max-width: 205px;
+	max-width: 214px;
 	overflow: hidden;
 	border-top: 2px solid #B6B6B6;
 }
@@ -27,7 +27,7 @@
 
 .preview-img {
 	vertical-align: middle;
-	max-width: 180px;
+	max-width: 184px;
 	cursor: pointer;
 	border: 2px solid #dfdfdf;
 	}
commit 742a8da4348ee0b7c059a76b2b2ca891180e81a2
Author: Pranav Kant <pranavk at collabora.com>
Date:   Fri Apr 29 11:22:26 2016 +0530

    bccu#1749: Fix flashing of spreadsheet-toolbar during doc load
    
    Hide the spreadsheet-toolbar by default, and only show when we
    are confirmed that its a spreadsheet, instead of doing
    vice-versa.
    
    Change-Id: Iddaca0fb272dbe8dd8b6e73157eb4733762d8a8a

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 91e6e08..0128b2c 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -113,10 +113,10 @@ $(function () {
 	$('#spreadsheet-toolbar').w2toolbar({
 		name: 'spreadsheet-toolbar',
 		items: [
-			{ type: 'button',  id: 'firstrecord',  img: 'firstrecord', hint: _("First Sheet") },
-			{ type: 'button',  id: 'prevrecord',  img: 'prevrecord', hint: _("Previous Sheet") },
-			{ type: 'button',  id: 'nextrecord',  img: 'nextrecord', hint: _("Next Sheet") },
-			{ type: 'button',  id: 'lastrecord',  img: 'lastrecord', hint: _("Last Sheet") }
+			{ 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") }
 		],
 		onClick: function (e) {
 			onClick(e.target);
@@ -831,12 +831,12 @@ map.on('updateparts pagenumberchanged', function (e) {
 		toolbar.hide('incdecindent');
 	}
 
-	var toolbar = w2ui['spreadsheet-toolbar'];
-	if (e.docType !== 'spreadsheet') {
-		toolbar.hide('firstrecord');
-		toolbar.hide('nextrecord');
-		toolbar.hide('prevrecord');
-		toolbar.hide('lastrecord');
+	toolbar = w2ui['spreadsheet-toolbar'];
+	if (e.docType === 'spreadsheet') {
+		toolbar.show('firstrecord');
+		toolbar.show('nextrecord');
+		toolbar.show('prevrecord');
+		toolbar.show('lastrecord');
 	}
 });