[Libreoffice-commits] online.git: loleaflet/src

[Aron Budea (via logerrit)]

 loleaflet/src/control/Control.Toolbar.js |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 11d9c28478e1a6f274536567db3090a66ac85b3c
Author:     Aron Budea <aron.budea at collabora.com>
AuthorDate: Tue May 19 18:35:41 2020 +0200
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Tue May 19 19:36:22 2020 +0200

    tdf#133078: Make selection from Borders dropdown work again
    
    If color was undefined, parseInt() of 0 (already int) failed.
    
    Regression from 877e4fd5873f5344f6367fbbbfbc60c3f9dde465
    
    Change-Id: Ie7c1e4666a5560c39fd395419185933be395d54c
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94543
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Aron Budea <aron.budea at collabora.com>

diff --git a/loleaflet/src/control/Control.Toolbar.js b/loleaflet/src/control/Control.Toolbar.js
index 6e0b5950f..500ca36b5 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -188,8 +188,7 @@ function closePopup() {
 function setBorderStyle(num, color) {
 	if (color === undefined)
 		color = 0; // black
-
-	if (color.startsWith('#'))
+	else if (color.startsWith('#'))
 		color = parseInt('0x' + color.substring(1, color.length));
 
 	switch (num) {