mirror of
https://github.com/wled/WLED.git
synced 2025-04-24 06:47:18 +00:00
Minor UI optimisations.
This commit is contained in:
parent
611816c8e3
commit
9e583f9ff0
@ -39,8 +39,8 @@ var hol = [
|
||||
var cpick = new iro.ColorPicker("#picker", {
|
||||
width: 260,
|
||||
wheelLightness: false,
|
||||
wheelAngle: 90,
|
||||
layout: [
|
||||
wheelAngle: 90,
|
||||
layout: [
|
||||
{
|
||||
component: iro.ui.Wheel,
|
||||
options: {}
|
||||
@ -212,17 +212,17 @@ function onLoad()
|
||||
method: 'get'
|
||||
})
|
||||
.then(res => {
|
||||
//if (!res.ok) showErrorToast();
|
||||
return res.json();
|
||||
})
|
||||
.then(json => {
|
||||
if (Array.isArray(json)) hol = json;
|
||||
//TODO: do some parsing first
|
||||
loadBg(cfg.theme.bg.url);
|
||||
})
|
||||
.catch(function (error) {
|
||||
loadBg(cfg.theme.bg.url);
|
||||
.catch(function(error){
|
||||
console.log("holidays.json does not contain array of holidays. Defaults loaded.");
|
||||
})
|
||||
.finally(function(){
|
||||
loadBg(cfg.theme.bg.url);
|
||||
});
|
||||
} else
|
||||
loadBg(cfg.theme.bg.url);
|
||||
@ -461,7 +461,6 @@ function loadPalettes(callback = null)
|
||||
})
|
||||
.catch(function (error) {
|
||||
showToast(error, true);
|
||||
console.log(error);
|
||||
presetError(false);
|
||||
if (callback) callback();
|
||||
});
|
||||
@ -479,13 +478,13 @@ function loadFX(callback = null)
|
||||
return res.json();
|
||||
})
|
||||
.then(json => {
|
||||
clearErrorToast();
|
||||
eJson = Object.entries(json);
|
||||
populateEffects();
|
||||
if (callback) callback();
|
||||
})
|
||||
.catch(function (error) {
|
||||
showToast(error, true);
|
||||
console.log(error);
|
||||
presetError(false);
|
||||
if (callback) callback();
|
||||
});
|
||||
@ -1154,7 +1153,7 @@ function readState(s,command=false)
|
||||
if (isRgbw) whites[e] = parseInt(w);
|
||||
selectSlot(csel);
|
||||
}
|
||||
gId('sliderSpeed').value = whites[csel];
|
||||
gId('sliderW').value = whites[csel];
|
||||
|
||||
gId('sliderSpeed').value = i.sx;
|
||||
gId('sliderIntensity').value = i.ix;
|
||||
|
1616
wled00/html_ui.h
1616
wled00/html_ui.h
File diff suppressed because it is too large
Load Diff
@ -8,7 +8,7 @@
|
||||
*/
|
||||
|
||||
// version code in format yymmddb (b = daily build)
|
||||
#define VERSION 2107191
|
||||
#define VERSION 2107221
|
||||
|
||||
//uncomment this if you have a "my_config.h" file you'd like to use
|
||||
//#define WLED_USE_MY_CONFIG
|
||||
|
Loading…
x
Reference in New Issue
Block a user