Netsyms/colorPicker
2
0
Fork 0
mirror of https://github.com/PitPik/colorPicker.git synced 2025-09-24 16:40:57 -06:00
Code Issues Releases Wiki Activity

invalid hidden characters

Browse Source 
See issue #5
This commit is contained in:
Ruben Almeida 2016-08-18 00:32:56 +02:00 committed by GitHub
parent 41f4d0e906
commit bca9299d8c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
colors.js
View File

@ -44,7 +44,7 @@
// convertCallback: undefined, // convertCallback: undefined,
// allMixDetails: false // allMixDetails: false
}; };
initInstance(this, options || {}); initInstance(this, options || {});
}, },
initInstance = function(THIS, options) { initInstance = function(THIS, options) {
var matrix, var matrix,
@ -156,7 +156,7 @@
}; };
Colors.prototype.toString = function(colorMode, forceAlpha) { Colors.prototype.toString = function(colorMode, forceAlpha) {
return ColorConverter.color2text((colorMode || 'rgb').toLowerCase(), this.colors, forceAlpha); return ColorConverter.color2text((colorMode || 'rgb').toLowerCase(), this.colors, forceAlpha);
}; };
@ -374,12 +374,12 @@
color2text: function(colorMode, colors, forceAlpha) { color2text: function(colorMode, colors, forceAlpha) {
var alpha = forceAlpha !== false && _math.round(colors.alpha * 100) / 100, var alpha = forceAlpha !== false && _math.round(colors.alpha * 100) / 100,
hasAlpha = typeof alpha === 'number' && hasAlpha = typeof alpha === 'number' &&
forceAlpha !== false && (forceAlpha || alpha !== 1), forceAlpha !== false && (forceAlpha || alpha !== 1),
RGB = colors.RND.rgb, RGB = colors.RND.rgb,
HSL = colors.RND.hsl, HSL = colors.RND.hsl,
shouldBeHex = colorMode === 'hex' && hasAlpha, shouldBeHex = colorMode === 'hex' && hasAlpha,
isHex = colorMode === 'hex' && !shouldBeHex, isHex = colorMode === 'hex' && !shouldBeHex,
isRgb = colorMode === 'rgb' || shouldBeHex, isRgb = colorMode === 'rgb' || shouldBeHex,
innerText = isRgb ? RGB.r + ', ' + RGB.g + ', ' + RGB.b : innerText = isRgb ? RGB.r + ', ' + RGB.g + ', ' + RGB.b :
!isHex ? HSL.h + ', ' + HSL.s + '%, ' + HSL.l + '%' : !isHex ? HSL.h + ', ' + HSL.s + '%, ' + HSL.l + '%' :
'#' + colors.HEX; '#' + colors.HEX;