Bram
/
BangleApps
forked from FOSS/BangleApps
1
0
Fork 0
Code Pull Requests Activity

wid_edit - Access global variables explicitly

master
Martin Boonk 2022-11-06 13:36:14 +01:00
parent 3462b36f9c
commit 9f17ea5c98
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/wid_edit/boot.js
View File

@ -7,14 +7,14 @@ Bangle.loadWidgets = (o => ()=>{
// store defaults of customized values in _WIDGETS
if (!global._WIDGETS) global._WIDGETS = {};
if (!global._WIDGETS[w]) global._WIDGETS[w] = {};
Object.keys(c[w]).forEach(k => _WIDGETS[w][k] = WIDGETS[w][k]);
Object.keys(c[w]).forEach(k => global._WIDGETS[w][k] = global.WIDGETS[w][k]);
//overide values in widget with configured ones
Object.assign(WIDGETS[w], c[w]);
Object.assign(global.WIDGETS[w], c[w]);
}
const W = WIDGETS;
WIDGETS = {};
const W = global.WIDGETS;
global.WIDGETS = {};
Object.keys(W)
.sort()
.sort((a, b) => (0|W[b].sortorder)-(0|W[a].sortorder))
.forEach(k => WIDGETS[k] = W[k]);
.forEach(k => global.WIDGETS[k] = W[k]);
})(Bangle.loadWidgets);

32
apps/wid_edit/settings.js
View File

@ -9,7 +9,7 @@
let cleanup = false;
for (const id in settings.custom) {
if (!(id in WIDGETS)) {
if (!(id in global.WIDGETS)) {
// widget which no longer exists
cleanup = true;
delete settings.custom[id];
@ -24,12 +24,12 @@
* Sort & redraw all widgets
*/
function redrawWidgets() {
let W = WIDGETS;
let W = global.WIDGETS;
global.WIDGETS = {};
Object.keys(W)
.sort()
.sort((a, b) => (0|W[b].sortorder)-(0|W[a].sortorder))
.forEach(k => {WIDGETS[k] = W[k]});
.forEach(k => {global.WIDGETS[k] = W[k];});
Bangle.drawWidgets();
}
@ -52,9 +52,9 @@
}
function edit(id) {
let WIDGET = WIDGETS[id],
let WIDGET = global.WIDGETS[id],
def = {area: WIDGET.area, sortorder: WIDGET.sortorder|0}; // default values
Object.assign(def, _WIDGETS[id]||{}); // defaults were saved in _WIDGETS
Object.assign(def, global._WIDGETS[id]||{}); // defaults were saved in _WIDGETS
settings.custom = settings.custom||{};
let saved = settings.custom[id] || {},
@ -102,7 +102,7 @@
settings.custom = settings.custom || {};
settings.custom[id] = saved;
} else if (settings.custom) {
delete settings.custom[id]
delete settings.custom[id];
}
if (!Object.keys(settings.custom).length) delete settings.custom;
require("Storage").writeJSON("wid_edit.json", settings);
@ -112,8 +112,8 @@
let _W = {};
if (saved.area) _W.area = def.area;
if ('sortorder' in saved) _W.sortorder = def.sortorder;
if (Object.keys(_W).length) _WIDGETS[id] = _W;
else delete _WIDGETS[id];
if (Object.keys(_W).length) global._WIDGETS[id] = _W;
else delete global._WIDGETS[id];
// drawWidgets won't clear e.g. bottom bar if we just disabled the last bottom widget
redrawWidgets();
@ -149,7 +149,7 @@
save();
mainMenu(); // changing multiple values made the rest of the menu wrong, so take the easy out
}
}
};
let m = E.showMenu(menu);
}
@ -163,25 +163,25 @@
if (!Object.keys(_WIDGETS).length) delete _WIDGETS; // no defaults to remember
back();
};
Object.keys(WIDGETS).forEach(id=>{
Object.keys(global.WIDGETS).forEach(id=>{
// mark customized widgets with asterisk
menu[name(id)+((id in _WIDGETS) ? " *" : "")] = () => edit(id);
menu[name(id)+((id in global._WIDGETS) ? " *" : "")] = () => edit(id);
});
if (Object.keys(_WIDGETS).length) { // only show reset if there is anything to reset
if (Object.keys(global._WIDGETS).length) { // only show reset if there is anything to reset
menu[/*LANG*/"Reset All"] = () => {
E.showPrompt(/*LANG*/"Reset all widgets?").then(confirm => {
if (confirm) {
delete settings.custom;
require("Storage").writeJSON("wid_edit.json", settings);
for(let id in _WIDGETS) {
Object.assign(WIDGETS[id], _WIDGETS[id]) // restore defaults
for(let id in global._WIDGETS) {
Object.assign(global.WIDGETS[id], global._WIDGETS[id]); // restore defaults
}
global._WIDGETS = {};
redrawWidgets();
}
mainMenu(); // reload with reset widgets
})
}
});
};
}
E.showMenu(menu);