mirror of
https://github.com/espruino/Espruino.git
synced 2025-12-08 19:06:15 +00:00
Fix errors when no launcher is installed
This commit is contained in:
parent
cba50deac1
commit
01829f9de4
@ -1,9 +1,10 @@
|
||||
(function() {
|
||||
let s = require("Storage").readJSON("setting.json",1)||{};
|
||||
let launcherApp = s.launcher;
|
||||
let launcherApp = require("Storage").read(s.launcher);
|
||||
|
||||
if (!launcherApp) {
|
||||
launcherApp = require("Storage").list(/\.info$/)
|
||||
launcherApp = undefined; // configured app not found
|
||||
let info = require("Storage").list(/\.info$/)
|
||||
.map(file => {
|
||||
const app = require("Storage").readJSON(file,1);
|
||||
if (app && app.type == "launch") {
|
||||
@ -11,11 +12,11 @@
|
||||
}
|
||||
})
|
||||
.filter(x=>x)
|
||||
.sort((a, b) => a.sortorder - b.sortorder)[0].src;
|
||||
print(launcherApp);
|
||||
if (launcherApp) {
|
||||
s.launcher = launcherApp;
|
||||
.sort((a, b) => a.sortorder - b.sortorder)[0];
|
||||
if (info) {
|
||||
s.launcher = info.src;
|
||||
require("Storage").writeJSON("setting.json",s);
|
||||
launcherApp = require("Storage").read(info.src);
|
||||
}
|
||||
}
|
||||
|
||||
@ -24,8 +25,8 @@
|
||||
} else {
|
||||
if (Bangle.uiRemove) {
|
||||
Bangle.setUI(); // remove all existing UI (and call Bangle.uiRemove)
|
||||
setTimeout(eval,0,require("Storage").read(launcherApp)); // Load launcher direct without a reboot
|
||||
} else load(launcherApp);
|
||||
setTimeout(eval,0,code); // Load launcher direct without a reboot
|
||||
} else load(s.launcher);
|
||||
}
|
||||
delete s;
|
||||
delete launcherApp;
|
||||
|
||||
4
libs/js/banglejs/Bangle_showLauncher.min.js
vendored
4
libs/js/banglejs/Bangle_showLauncher.min.js
vendored
@ -1,2 +1,2 @@
|
||||
(function(){let c=require("Storage").readJSON("setting.json",1)||{},a=c.launcher;a||(a=require("Storage").list(/\.info$/).map(b=>{if((b=require("Storage").readJSON(b,1))&&"launch"==b.type)return b}).filter(b=>b).sort((b,d)=>b.sortorder-d.sortorder)[0].src,print(a),a&&(c.launcher=a,require("Storage").writeJSON("setting.json",c)));a?Bangle.uiRemove?(Bangle.setUI(),setTimeout(eval,0,require("Storage").read(a))):load(a):eval('E.showMessage("No Launcher Found");setWatch(()=>{load();}, global.BTN2||BTN, {repeat:false,edge:"falling"});');
|
||||
delete c;delete a});
|
||||
(function(){let b=require("Storage").readJSON("setting.json",1)||{},c=require("Storage").read(b.launcher);if(!c){c=void 0;let d=require("Storage").list(/\.info$/).map(a=>{if((a=require("Storage").readJSON(a,1))&&"launch"==a.type)return a}).filter(a=>a).sort((a,e)=>a.sortorder-e.sortorder)[0];d&&(b.launcher=d.src,require("Storage").writeJSON("setting.json",b),c=require("Storage").read(d.src))}c?Bangle.uiRemove?(Bangle.setUI(),setTimeout(eval,0,code)):load(b.launcher):eval('E.showMessage("No Launcher Found");setWatch(()=>{load();}, global.BTN2||BTN, {repeat:false,edge:"falling"});');
|
||||
delete b;delete c});
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user