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

YiiChang Yen sadwind.yan at gmail.com
Wed Jan 31 16:48:42 UTC 2018


 loleaflet/dist/toolbar/toolbar.js |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 43bf0f393d283fbedcaa024532bd8faab725ac63
Author: YiiChang Yen <sadwind.yan at gmail.com>
Date:   Mon Sep 4 14:00:05 2017 +0800

    loleaflet: Sortting font-select list localelly
    
    Change-Id: I6ebe7a30e0d47776986aa67b44de7b2bc1d25fca
    Reviewed-on: https://gerrit.libreoffice.org/41873
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit 488c2e98f3bcf0812df45df5651ced0891020fac)
    Reviewed-on: https://gerrit.libreoffice.org/49007
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 9e505e9a..cffed42e 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1330,7 +1330,9 @@ function updateCommandValues() {
 			data = data.concat(Object.keys(commandValues));
 		}
 		$('.fonts-select').select2({
-			data: data,
+			data: data.sort(function (a, b) {  // also sort(localely)
+				return a.localeCompare(b);
+			}),
 			placeholder: _('Font')
 		});
 		$('.fonts-select').on('select2:select', onFontSelect);


More information about the Libreoffice-commits mailing list