From e396214c1fb82628546b8295e45848e6b340e6c0 Mon Sep 17 00:00:00 2001 From: Nikita Dyumin Date: Wed, 4 Dec 2013 12:33:37 +0600 Subject: [PATCH] fixed rgbToRgbString method that returned "rgb(0,0,0,0)" instead of "rgba(0,0,0,0)" if alpha value was equal to 0 --- framework/source/class/qx/test/util/ColorUtil.js | 8 ++++++++ framework/source/class/qx/util/ColorUtil.js | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/framework/source/class/qx/test/util/ColorUtil.js b/framework/source/class/qx/test/util/ColorUtil.js index fc81da1f03f..8cc68ecf608 100644 --- a/framework/source/class/qx/test/util/ColorUtil.js +++ b/framework/source/class/qx/test/util/ColorUtil.js @@ -25,6 +25,14 @@ qx.Class.define("qx.test.util.ColorUtil", members : { + testRgbToRgbString : function() + { + this.assertEquals("rgba(255,0,0,1)", qx.util.ColorUtil.rgbToRgbString([255, 0, 0, 1])); + this.assertEquals("rgba(255,0,0,0.5)", qx.util.ColorUtil.rgbToRgbString([255, 0, 0, 0.5])); + this.assertEquals("rgba(255,0,0,0)", qx.util.ColorUtil.rgbToRgbString([255, 0, 0, 0])); + this.assertEquals("rgb(255,0,0)", qx.util.ColorUtil.rgbToRgbString([255, 0, 0])); + }, + testCssStringToRgb : function() { this.assertEquals("255,0,0", qx.util.ColorUtil.cssStringToRgb("rgba(255,0,0,1)")); diff --git a/framework/source/class/qx/util/ColorUtil.js b/framework/source/class/qx/util/ColorUtil.js index 8d774442d6e..0dd0f664eac 100644 --- a/framework/source/class/qx/util/ColorUtil.js +++ b/framework/source/class/qx/util/ColorUtil.js @@ -269,7 +269,7 @@ qx.Bootstrap.define("qx.util.ColorUtil", * @return {String} an RGB string */ rgbToRgbString : function(rgb) { - return "rgb" + (rgb[3] ? "a" : "") + "(" + rgb.join(",") + ")"; + return "rgb" + (rgb[3] !== undefined ? "a" : "") + "(" + rgb.join(",") + ")"; },