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

[Szymon Kłos (via logerrit)]

 loleaflet/src/control/Control.JSDialogBuilder.js |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e05808d447cef976d0ceb6f0ffd0e70da8d3298e
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Nov 8 15:54:16 2019 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri Nov 8 15:54:27 2019 +0100

    jsdialogs: don't show noColor also for font in Calc
    
    Change-Id: I791c1764fd0821f224e81f07e705f9d9ab82eea1

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index b7c9cb9a6..9c140166b 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -761,7 +761,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 		valueNode.style.backgroundColor = selectedColor;
 
 		var iconPath = builder._createIconPath(data.command);
-		var noColorControl = data.command !== '.uno:FontColor';
+		var noColorControl = (data.command !== '.uno:FontColor' && data.command !== '.uno:Color');
 
 		var callback = function(color) {
 			var command = data.command + '?Color:string=' + color;