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

[Marco Cecchetti]

 loleaflet/dist/toolbar/toolbar.js |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7e864dcfe57f45fcf5bb3d424ecee1f0ba31bd66
Author: Marco Cecchetti <marco.cecchetti at collabora.com>
Date:   Tue May 23 15:20:34 2017 +0200

    loleaflet: calc: styles are visible in fonts dropdown
    
    Change-Id: Ia909ed9f35d6a1c80f6696abeddefe2d4ad2d6a0
    Reviewed-on: https://gerrit.libreoffice.org/38003
    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 11ad3244..ca6fea60 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1316,6 +1316,7 @@ function updateCommandValues() {
 		if (typeof commandValues === 'undefined') {
 			return;
 		}
+		data = []; // reset data in order to avoid that the font select box is populated with styles, too.
 		// Old browsers like IE11 et al don't like Object.keys with
 		// empty arguments
 		if (typeof commandValues === 'object') {