Skip to content

Commit fb2e556

Browse files
committed
Allow playlist as end preset in playlist.
Playlist chaining.
1 parent 3f0eb0a commit fb2e556

File tree

2 files changed

+627
-625
lines changed

2 files changed

+627
-625
lines changed

wled00/data/index.js

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -506,12 +506,12 @@ function populatePresets(fromls)
506506
pJson["0"] = {};
507507
localStorage.setItem("wledP", JSON.stringify(pJson));
508508
}
509-
pmtLS = pmt;
510-
for (var a = 0; a < is.length; a++) {
511-
let i = is[a];
512-
if (expanded[i+100]) expand(i+100, true);
513-
}
514-
makePlSel(arr);
509+
pmtLS = pmt;
510+
for (var a = 0; a < is.length; a++) {
511+
let i = is[a];
512+
if (expanded[i+100]) expand(i+100, true);
513+
}
514+
//makePlSel(arr);
515515
} else { presetError(true); }
516516
updatePA();
517517
populateQL();
@@ -1296,14 +1296,16 @@ var plJson = {"0":{
12961296
"end": 0
12971297
}};
12981298

1299-
var plSelContent = "";
1300-
function makePlSel(arr) {
1301-
plSelContent = "";
1299+
//var plSelContent = "";
1300+
function makePlSel(incPl=false) {
1301+
var plSelContent = "";
1302+
var arr = Object.entries(pJson);
13021303
for (var i = 0; i < arr.length; i++) {
13031304
var n = arr[i][1].n ? arr[i][1].n : "Preset " + arr[i][0];
1304-
if (arr[i][1].playlist && arr[i][1].playlist.ps) continue; //remove playlists, sub-playlists not yet supported
1305+
if (!incPl && arr[i][1].playlist && arr[i][1].playlist.ps) continue; //remove playlists, sub-playlists not yet supported
13051306
plSelContent += `<option value=${arr[i][0]}>${n}</option>`
13061307
}
1308+
return plSelContent;
13071309
}
13081310

13091311
function refreshPlE(p) {
@@ -1391,7 +1393,7 @@ function makeP(i,pl) {
13911393
End preset:<br>
13921394
<select class="btn sel sel-ple" id="pl${i}selEnd" onchange="plR(${i})" data-val=${plJson[i].end?plJson[i].end:0}>
13931395
<option value=0>None</option>
1394-
${plSelContent}
1396+
${makePlSel(true)}
13951397
</select>
13961398
</div>
13971399
<button class="btn btn-i btn-p" onclick="testPl(${i}, this)"><i class='icons btn-icon'>&#xe139;</i>Test</button>`;
@@ -1449,7 +1451,7 @@ function makePlEntry(p,i) {
14491451
return `
14501452
<div class="plentry">
14511453
<select class="btn sel sel-pl" onchange="plePs(${p},${i},this)" data-val=${plJson[p].ps[i]} data-index=${i}>
1452-
${plSelContent}
1454+
${makePlSel()}
14531455
</select>
14541456
<button class="btn btn-i btn-xs btn-pl-del" onclick="delPl(${p},${i})"><i class="icons btn-icon">&#xe037;</i></button>
14551457
<div class="h plnl">Duration</div><div class="h plnl">Transition</div><div class="h pli">#${i+1}</div><br>

0 commit comments

Comments
 (0)