lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add segment bounds check.

Browse Source
This commit is contained in:
Blaz Kristan 2022-11-19 11:57:38 +01:00
parent c14c4425a4
commit 43582b6319
2 changed files with 950 additions and 937 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wled00/data/index.js
View File

@ -1674,7 +1674,7 @@ function makeSeg()
<tr> <tr>
<td><input class="noslide segn" id="seg${lu}s" type="number" min="0" max="${isM?mw-1:ledCount-1}" value="${ns}" oninput="updateLen(${lu})" onkeydown="segEnter(${lu})"></td> <td><input class="noslide segn" id="seg${lu}s" type="number" min="0" max="${isM?mw-1:ledCount-1}" value="${ns}" oninput="updateLen(${lu})" onkeydown="segEnter(${lu})"></td>
<td><input class="noslide segn" id="seg${lu}e" type="number" min="0" max="${ct}" value="${ct}" oninput="updateLen(${lu})" onkeydown="segEnter(${lu})"></td> <td><input class="noslide segn" id="seg${lu}e" type="number" min="0" max="${ct}" value="${ct}" oninput="updateLen(${lu})" onkeydown="segEnter(${lu})"></td>
<td><button class="btn btn-xs" onclick="setSeg(${lu});resetUtil();"><i class="icons bth-icon" id="segc${lu}">&#xe390;</i></button></td> <td><button class="btn btn-xs" onclick="setSeg(${lu});"><i class="icons bth-icon" id="segc${lu}">&#xe390;</i></button></td>
</tr> </tr>
${isM ? '<tr><td>Start Y</td><td>'+(cfg.comp.seglen?'Height':'Stop Y')+'</td></tr>'+ ${isM ? '<tr><td>Start Y</td><td>'+(cfg.comp.seglen?'Height':'Stop Y')+'</td></tr>'+
'<tr>'+ '<tr>'+
@ -2003,13 +2003,21 @@ function rptSeg(s)
function setSeg(s) function setSeg(s)
{ {
var name = gId(`seg${s}t`).value; var name = gId(`seg${s}t`).value;
var start = parseInt(gId(`seg${s}s`).value); let sX = gId(`seg${s}s`);
var stop = parseInt(gId(`seg${s}e`).value); let eX = gId(`seg${s}e`);
var start = parseInt(sX.value);
var stop = parseInt(eX.value);
if (start<sX.min || start>sX.max) {sX.value=sX.min; return;} // prevent out of bounds
if (stop<eX.min || stop>eX.max) {eX.value=eX.max; return;} // prevent out of bounds
if ((cfg.comp.seglen && stop == 0) || (!cfg.comp.seglen && stop <= start)) {delSeg(s); return;} if ((cfg.comp.seglen && stop == 0) || (!cfg.comp.seglen && stop <= start)) {delSeg(s); return;}
var obj = {"seg": {"id": s, "n": name, "start": start, "stop": (cfg.comp.seglen?start:0)+stop}}; var obj = {"seg": {"id": s, "n": name, "start": start, "stop": (cfg.comp.seglen?start:0)+stop}};
if (isM) { if (isM) {
var startY = parseInt(gId(`seg${s}sY`).value); let sY = gId(`seg${s}sY`);
var stopY = parseInt(gId(`seg${s}eY`).value); let eY = gId(`seg${s}eY`);
var startY = parseInt(sY.value);
var stopY = parseInt(eY.value);
if (startY<sY.min || startY>sY.max) {sY.value=sY.min; return;} // prevent out of bounds
if (stopY<eY.min || stop>eY.max) {eY.value=eY.max; return;} // prevent out of bounds
obj.seg.startY = startY; obj.seg.startY = startY;
obj.seg.stopY = (cfg.comp.seglen?startY:0)+stopY; obj.seg.stopY = (cfg.comp.seglen?startY:0)+stopY;
} }
@ -2022,6 +2030,7 @@ function setSeg(s)
obj.seg.of = ofs; obj.seg.of = ofs;
if (isM) obj.seg.tp = gId(`seg${s}tp`).checked; if (isM) obj.seg.tp = gId(`seg${s}tp`).checked;
} }
resetUtil(); // close add segment dialog just in case
requestJson(obj); requestJson(obj);
} }

1868
wled00/html_ui.h
View File

File diff suppressed because it is too large Load Diff