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

[Libreoffice Gerrit user]

 loleaflet/dist/toolbar/toolbar.js     |    4 ++--
 loleaflet/src/control/Control.Tabs.js |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 07d865704e6c8b32bdda8489cef7aeafe6c3bb9b
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Nov 1 10:25:58 2018 +0100
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Fri Nov 2 05:11:34 2018 +0100

    Font size dropdown placeholder string 'Size' and its translations were too long and did not fit
    
    Change-Id: I7950f2411f5f148043390277566b0ecd15961085
    Reviewed-on: https://gerrit.libreoffice.org/62720
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    Tested-by: Aron Budea <aron.budea at collabora.com>

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index e7b4ed8b4..9833cfc91 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -805,7 +805,7 @@ function updateFontSizeList(font) {
 	data = data.concat(map.getToolbarCommandValues('.uno:CharFontName')[font]);
 	$('.fontsizes-select').select2({
 		data: data,
-		placeholder: _('Size'),
+		placeholder: ' ',
 		//Allow manually entered font size.
 		createTag: function(query) {
 			return {
@@ -1405,7 +1405,7 @@ function updateCommandValues() {
 
 	if ($('.fontsizes-select option').length === 0) {
 		$('.fontsizes-select').select2({
-			placeholder: _('Size'),
+			placeholder: ' ',
 			data: []
 		});
 
commit 431b307986cbd71ace4ee5894b606705f1e7dcb8
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Nov 1 11:21:30 2018 +0100
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Fri Nov 2 05:11:22 2018 +0100

    loleaflet: Rename Sheet dialog should have the current sheet name in input box
    
    Change-Id: I944d4781d551ddb5212bd162935719897f121513
    Reviewed-on: https://gerrit.libreoffice.org/62727
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    Tested-by: Aron Budea <aron.budea at collabora.com>

diff --git a/loleaflet/src/control/Control.Tabs.js b/loleaflet/src/control/Control.Tabs.js
index 76e2f946e..d38f13f74 100644
--- a/loleaflet/src/control/Control.Tabs.js
+++ b/loleaflet/src/control/Control.Tabs.js
@@ -63,7 +63,7 @@ L.Control.Tabs = L.Control.extend({
 								var nPos = parseInt(options.$trigger.attr('id').split('spreadsheet-tab')[1]);
 								vex.dialog.open({
 									message: _('Enter new sheet name'),
-									input: '<input name="sheetname" type="text" required />',
+									input: '<input name="sheetname" type="text" value="' + options.$trigger.text() + '" required />',
 									callback: function(data) {
 										map.renamePage(data.sheetname, nPos);
 									}