|
87 | 87 | }; |
88 | 88 |
|
89 | 89 | Colors.prototype.toString = function(colorMode, forceAlpha) { |
90 | | - return ColorConverter.color2text(colorMode || 'rgba', this.colors, forceAlpha); |
| 90 | + return ColorConverter.color2text(colorMode.toLowerCase() || 'rgb', this.colors, forceAlpha); |
91 | 91 | }; |
92 | 92 |
|
93 | 93 | // ------------------------------------------------------ // |
|
259 | 259 | forceAlpha !== false && (forceAlpha || alpha !== 1), |
260 | 260 | RGB = colors.RND.rgb, |
261 | 261 | HSL = colors.RND.hsl, |
262 | | - mode = colorMode.toLowerCase().substr(0, 3), |
263 | | - shouldBeHex = mode === 'hex' && hasAlpha, |
264 | | - isHex = mode === 'hex' && !shouldBeHex, |
265 | | - isRgb = mode === 'rgb' || shouldBeHex, |
| 262 | + shouldBeHex = colorMode === 'hex' && hasAlpha, |
| 263 | + isHex = colorMode === 'hex' && !shouldBeHex, |
| 264 | + isRgb = colorMode === 'rgb' || shouldBeHex, |
266 | 265 | innerText = isRgb ? RGB.r + ', ' + RGB.g + ', ' + RGB.b : |
267 | | - HSL.h + ', ' + HSL.s + '%, ' + HSL.l + '%', |
268 | | - text = isHex ? '#' + colors.HEX : (shouldBeHex ? 'rgb' : mode) + |
269 | | - (hasAlpha ? 'a' : '') + '(' + innerText + |
270 | | - (hasAlpha ? ', ' + alpha : '') + ')'; |
| 266 | + !isHex ? HSL.h + ', ' + HSL.s + '%, ' + HSL.l + '%' : |
| 267 | + '#' + colors.HEX; |
271 | 268 |
|
272 | | - return text; |
| 269 | + return isHex ? innerText : (shouldBeHex ? 'rgb' : colorMode) + |
| 270 | + (hasAlpha ? 'a' : '') + '(' + innerText + (hasAlpha ? ', ' + alpha : '') + ')'; |
273 | 271 | }, |
274 | 272 |
|
275 | 273 | RGB2HEX: function(RGB) { |
|
0 commit comments