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

Fix issue where loader could forget apps if 'don't ask again' was clicked in the watch chooser

master
Gordon Williams 2021-11-10 13:06:15 +00:00
parent 8b987aa1f4
commit 779e550152
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
loader.js
View File

@ -55,7 +55,7 @@ function onFoundDeviceInfo(deviceId, deviceVersion) {
var originalAppJSON = undefined;
function filterAppsForDevice(deviceId) {
if (originalAppJSON===undefined)
if (originalAppJSON===undefined && appJSON.length)
originalAppJSON = appJSON;
var device = DEVICEINFO.find(d=>d.id==deviceId);
@ -97,8 +97,7 @@ function setSavedDeviceId(deviceId) {
// At boot, show a window to choose which type of device you have...
window.addEventListener('load', (event) => {
let deviceId = getSavedDeviceId()
if (deviceId !== undefined)
return filterAppsForDevice(deviceId);
if (deviceId !== undefined) return; // already chosen
var html = `<div class="columns">
${DEVICEINFO.map(d=>`
@ -168,6 +167,10 @@ window.addEventListener('load', (event) => {
});
function onAppJSONLoaded() {
let deviceId = getSavedDeviceId()
if (deviceId !== undefined)
filterAppsForDevice(deviceId);
return new Promise(resolve => {
httpGet("screenshots.json").then(screenshotJSON=>{
var screenshots = [];