mirror of https://github.com/espruino/BangleApps
Update widget.js
* Load settings on reload of widget * Do not draw widget when `hide` is setpull/1029/head
parent
8bcedfa552
commit
b6b7aa8a46
|
@ -3,7 +3,24 @@
|
|||
|
||||
var dirty = false;
|
||||
|
||||
let settings;
|
||||
|
||||
function loadSettings() {
|
||||
const d = require('Storage').readJSON('weather.json', 1) || {};
|
||||
settings = d.settings || {};
|
||||
}
|
||||
|
||||
function setting(key) {
|
||||
if (!settings) { loadSettings(); }
|
||||
const DEFAULTS = {
|
||||
'expiry': 2*3600000,
|
||||
'hide': false
|
||||
};
|
||||
return (key in settings) ? settings[key] : DEFAULTS[key];
|
||||
}
|
||||
|
||||
weather.on("update", w => {
|
||||
if (setting('hide')) return;
|
||||
if (w) {
|
||||
if (!WIDGETS["weather"].width) {
|
||||
WIDGETS["weather"].width = 20;
|
||||
|
@ -21,28 +38,12 @@
|
|||
});
|
||||
|
||||
Bangle.on('lcdPower', on => {
|
||||
if (on && dirty) {
|
||||
if (on && dirty && !setting('hide')) {
|
||||
WIDGETS["weather"].draw();
|
||||
dirty = false;
|
||||
}
|
||||
});
|
||||
|
||||
let settings;
|
||||
|
||||
function loadSettings() {
|
||||
const d = require('Storage').readJSON('weather.json', 1) || {};
|
||||
settings = d.settings || {};
|
||||
}
|
||||
|
||||
function setting(key) {
|
||||
if (!settings) { loadSettings(); }
|
||||
const DEFAULTS = {
|
||||
'expiry': 2*3600000,
|
||||
'hide': false
|
||||
};
|
||||
return (key in settings) ? settings[key] : DEFAULTS[key];
|
||||
}
|
||||
|
||||
WIDGETS["weather"] = {
|
||||
area: "tl",
|
||||
width: weather.get() && !setting('hide') ? 20 : 0,
|
||||
|
@ -63,5 +64,9 @@
|
|||
g.drawString(t, this.x+10, this.y+24);
|
||||
}
|
||||
},
|
||||
reload:function() {
|
||||
loadSettings();
|
||||
WIDGETS["weather"].redraw();
|
||||
},
|
||||
};
|
||||
})();
|
||||
|
|
Loading…
Reference in New Issue