jeans/WLED
jeans/WLED
1
0
Fork 0
mirror of https://github.com/wled/WLED.git synced 2025-07-25 19:56:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make loadBg() more readable

Browse Source
This commit is contained in:
Woody 2024-01-07 23:37:33 +01:00
parent 43f5e4360d
commit 157debf8e4
No known key found for this signature in database
GPG Key ID: 9872D7F5072789B2
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
wled00/data/index.js
View File

@ -32,13 +32,14 @@ var cfg = {
labels:true, pcmbot:false, pid:true, seglen:false, segpwr:false, segexp:false, labels:true, pcmbot:false, pid:true, seglen:false, segpwr:false, segexp:false,
css:true, hdays:false, fxdef:true, on:0, off:0, idsort: false} css:true, hdays:false, fxdef:true, on:0, off:0, idsort: false}
}; };
// [year, month (0 -> January, 11 -> December), day, duration in days, image url]
var hol = [ var hol = [
[0,11,24,4,"https://aircoookie.github.io/xmas.png"], // christmas [0, 11, 24, 4, "https://aircoookie.github.io/xmas.png"], // christmas
[0,2,17,1,"https://images.alphacoders.com/491/491123.jpg"], // st. Patrick's day [0, 2, 17, 1, "https://images.alphacoders.com/491/491123.jpg"], // st. Patrick's day
[2025,3,20,2,"https://aircoookie.github.io/easter.png"], [2025, 3, 20, 2, "https://aircoookie.github.io/easter.png"], // easter 2025
[2024,2,31,2,"https://aircoookie.github.io/easter.png"], [2024, 2, 31, 2, "https://aircoookie.github.io/easter.png"], // easter 2024
[0,6,4,1,"https://images.alphacoders.com/516/516792.jpg"], // 4th of July [0, 6, 4, 1, "https://images.alphacoders.com/516/516792.jpg"], // 4th of July
[0,0,1,1,"https://images.alphacoders.com/119/1198800.jpg"] // new year [0, 0, 1, 1, "https://images.alphacoders.com/119/1198800.jpg"] // new year
]; ];
var cpick = new iro.ColorPicker("#picker", { var cpick = new iro.ColorPicker("#picker", {
@ -175,19 +176,19 @@ function cTheme(light) {
} }
} }
function loadBg(iUrl) function loadBg() {
{ const { url: iUrl, rnd: iRnd } = cfg.theme.bg;
let bg = gId('bg'); const bg = gId('bg');
let img = d.createElement("img"); const img = d.createElement("img");
img.src = iUrl; img.src = iUrl;
if (iUrl == "" || iUrl==="https://picsum.photos/1920/1080") { if (!iUrl || iRnd) {
var today = new Date(); const today = new Date();
for (var h of (hol||[])) { for (const holiday of (hol || [])) {
var yr = h[0]==0 ? today.getFullYear() : h[0]; const year = holiday[0] == 0 ? today.getFullYear() : holiday[0];
var hs = new Date(yr,h[1],h[2]); const holidayStart = new Date(year, holiday[1], holiday[2]);
var he = new Date(hs); const holidayEnd = new Date(holidayStart);
he.setDate(he.getDate() + h[3]); holidayEnd.setDate(holidayEnd.getDate() + holiday[3]);
if (today>=hs && today<=he) img.src = h[4]; if (today >= holidayStart && today <= holidayEnd) img.src = holiday[4];
} }
} }
img.addEventListener('load', (e) => { img.addEventListener('load', (e) => {
@ -195,7 +196,6 @@ function loadBg(iUrl)
if (isNaN(a)) a = 0.6; if (isNaN(a)) a = 0.6;
bg.style.opacity = a; bg.style.opacity = a;
bg.style.backgroundImage = `url(${img.src})`; bg.style.backgroundImage = `url(${img.src})`;
img = null;
gId('namelabel').style.color = "var(--c-c)"; // improve namelabel legibility on background image gId('namelabel').style.color = "var(--c-c)"; // improve namelabel legibility on background image
}); });
} }
@ -266,10 +266,10 @@ function onLoad()
console.log("No array of holidays in holidays.json. Defaults loaded."); console.log("No array of holidays in holidays.json. Defaults loaded.");
}) })
.finally(()=>{ .finally(()=>{
loadBg(cfg.theme.bg.url); loadBg();
}); });
} else } else
loadBg(cfg.theme.bg.url); loadBg();
selectSlot(0); selectSlot(0);
updateTablinks(0); updateTablinks(0);