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

[Szymon KÅ‚os (via logerrit)]

 loleaflet/src/control/Control.JSDialogBuilder.js |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 97fe8ac3209f952262e515ec05eac655a44f00c9
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon Aug 10 13:24:15 2020 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue Aug 11 13:35:44 2020 +0200

    Don't ignore 'transparent' value for color
    
    Change-Id: Ie843e85fca76b5aad875426c661e9305c954d627
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100429
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index 6a2f8e0aa..980ba21e7 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -1722,6 +1722,13 @@ L.Control.JSDialogBuilder = L.Control.extend({
 		 return false;
 	},
 
+	parseHexColor: function(color) {
+		if (color === 'transparent')
+			return -1;
+		else
+			return parseInt('0x' + color);
+	},
+
 	_sendColorCommand: function(builder, data, color) {
 		var gradientItem;
 
@@ -1752,7 +1759,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 			var params = {};
 			params[data.id] = {
 				type : 'long',
-				value : parseInt('0x' + color)
+				value : builder.parseHexColor(color)
 			};
 
 			builder.map['stateChangeHandler'].setItemValue(data.command, params[data.id].value);
@@ -1764,7 +1771,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 
 		// update the item state as we send
 		var items = builder.map['stateChangeHandler'];
-		items.setItemValue(data.command, parseInt('0x' + color));
+		items.setItemValue(data.command, builder.parseHexColor(color));
 
 		builder.map.sendUnoCommand(command);
 	},