diff --git a/apps/quicklaunch/settings.js b/apps/quicklaunch/settings.js index 10ef98584..79d138d82 100644 --- a/apps/quicklaunch/settings.js +++ b/apps/quicklaunch/settings.js @@ -2,23 +2,6 @@ var storage = require("Storage"); var settings = Object.assign(storage.readJSON("quicklaunch.json", true) || {}); -// Convert settings object from before v.0.12 -for (let c of ["leftapp","rightapp","upapp","downapp","tapapp"]){ - if (settings[c]) { - if (settings[c].name=="Quick Launch Extension") settings[c].name = "Extension"; - settings[c.substring(0,1)+"app"] = settings[c]; - delete settings[c]; - } -} -for (let c of ["extleftapp","extrightapp","extupapp","extdownapp","exttapapp"]){ - if (settings[c]) delete settings[c]; -} - -// Add default settings if they haven't been configured before. -for (let c of ["lapp","rapp","uapp","dapp","tapp"]){ // l=left, r=right, u=up, d=down, t=tap. - if (!settings[c]) settings[c] = {"name":"(none)"}; -} - var apps = storage.list(/\.info$/).map(app=>{var a=storage.readJSON(app,1);return a&&{name:a.name,type:a.type,sortorder:a.sortorder,src:a.src};}).filter(app=>app && (app.type=="app" || app.type=="launch" || app.type=="clock" || !app.type)); // Add psuedo app to trigger Bangle.showLauncher later @@ -46,6 +29,24 @@ apps.sort((a,b)=>{ return 0; }); +// Convert settings object from before v.0.12 +for (let c of ["leftapp","rightapp","upapp","downapp","tapapp"]){ + if (settings[c]) { + let cNew = c.substring(0,1)+"app"; + settings[cNew] = settings[c]; + if (settings[cNew].name=="Quick Launch Extension") save(cNew,extension); + delete settings[c]; + } +} +for (let c of ["extleftapp","extrightapp","extupapp","extdownapp","exttapapp"]){ + if (settings[c]) delete settings[c]; +} + +// Add default settings if they haven't been configured before. +for (let c of ["lapp","rapp","uapp","dapp","tapp"]){ // l=left, r=right, u=up, d=down, t=tap. + if (!settings[c]) settings[c] = {"name":"(none)"}; +} + function findPath(key) {return key.substring(0, key.length-3);} function save(key, value) {