mirror of
https://github.com/wled/WLED.git
synced 2025-07-23 18:56:41 +00:00
W Hex entry bugfix & optiisation
This commit is contained in:
parent
08d12f9ee6
commit
2ffc8dd228
@ -2690,28 +2690,28 @@ function fromRgb()
|
|||||||
var g = gId('sliderG').value;
|
var g = gId('sliderG').value;
|
||||||
var b = gId('sliderB').value;
|
var b = gId('sliderB').value;
|
||||||
setPicker(`rgb(${r},${g},${b})`);
|
setPicker(`rgb(${r},${g},${b})`);
|
||||||
let cd = gId('csl').children; // color slots
|
let cd = gId('csl').children[csel]; // color slots
|
||||||
cd[csel].dataset.r = r;
|
cd.dataset.r = r;
|
||||||
cd[csel].dataset.g = g;
|
cd.dataset.g = g;
|
||||||
cd[csel].dataset.b = b;
|
cd.dataset.b = b;
|
||||||
setCSL(cd[csel]);
|
setCSL(cd);
|
||||||
}
|
}
|
||||||
|
|
||||||
function fromW()
|
function fromW()
|
||||||
{
|
{
|
||||||
let w = gId('sliderW');
|
let w = gId('sliderW');
|
||||||
let cd = gId('csl').children; // color slots
|
let cd = gId('csl').children[csel]; // color slots
|
||||||
cd[csel].dataset.w = w.value;
|
cd.dataset.w = w.value;
|
||||||
setCSL(cd[csel]);
|
setCSL(cd);
|
||||||
updateTrail(w);
|
updateTrail(w);
|
||||||
}
|
}
|
||||||
|
|
||||||
// sr 0: from RGB sliders, 1: from picker, 2: from hex
|
// sr 0: from RGB sliders, 1: from picker, 2: from hex
|
||||||
function setColor(sr)
|
function setColor(sr)
|
||||||
{
|
{
|
||||||
var cd = gId('csl').children; // color slots
|
var cd = gId('csl').children[csel]; // color slots
|
||||||
let cdd = cd[csel].dataset;
|
let cdd = cd.dataset;
|
||||||
let w = 0, r,g,b;
|
let w = parseInt(cdd.w), r = parseInt(cdd.r), g = parseInt(cdd.g), b = parseInt(cdd.b);
|
||||||
if (sr == 1 && isRgbBlack(cdd)) cpick.color.setChannel('hsv', 'v', 100);
|
if (sr == 1 && isRgbBlack(cdd)) cpick.color.setChannel('hsv', 'v', 100);
|
||||||
if (sr != 2 && hasWhite) w = parseInt(gId('sliderW').value);
|
if (sr != 2 && hasWhite) w = parseInt(gId('sliderW').value);
|
||||||
var col = cpick.color.rgb;
|
var col = cpick.color.rgb;
|
||||||
@ -2719,7 +2719,7 @@ function setColor(sr)
|
|||||||
cdd.g = g = hasRGB ? col.g : w;
|
cdd.g = g = hasRGB ? col.g : w;
|
||||||
cdd.b = b = hasRGB ? col.b : w;
|
cdd.b = b = hasRGB ? col.b : w;
|
||||||
cdd.w = w;
|
cdd.w = w;
|
||||||
setCSL(cd[csel]);
|
setCSL(cd);
|
||||||
var obj = {"seg": {"col": [[],[],[]]}};
|
var obj = {"seg": {"col": [[],[],[]]}};
|
||||||
obj.seg.col[csel] = [r, g, b, w];
|
obj.seg.col[csel] = [r, g, b, w];
|
||||||
requestJson(obj);
|
requestJson(obj);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user