Mirrors/ICEcoder
2
0
Fork 0
mirror of https://github.com/icecoder/ICEcoder.git synced 2026-03-03 23:34:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Can use rgba (+uc), rgbToHex ignores 4th alpha param

Browse Source
This commit is contained in:
mattpass
2020-12-30 15:47:26 +00:00
parent de3e46d5ee
commit af7e57b1d9
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
assets/js/icecoder.js
View File

@@ -3163,9 +3163,9 @@ var ICEcoder = {
farbtastic('picker','color');
// If we have a color value, set it in picker
if (color) {
// If an RGB value, convert to hex
if (-1 < color.indexOf("rgb")) {
color = color.replace(/rgb|\(|\)|\s+/g, "").split(",");
// If a RGB(A) value, convert to Hex
if (-1 < color.toLowerCase().indexOf("rgb")) {
color = color.replace(/rgba?|\(|\)|\s+/gi, "").split(",");
color = "#" + this.rgbToHex(...color);
}
get('picker').farbtastic.setColor(color);
@@ -3263,8 +3263,9 @@ var ICEcoder = {
}
},
// Convert RGB values to Hex
rgbToHex: function(r, g, b) {
// Convert RGB(A) values to Hex
rgbToHex: function(r, g, b, a) {
// Ignore alpha, use r, g, b
return this.toHex(r) + this.toHex(g) + this.toHex(b);
},