From 8ddbc90c33b3e9565bf37b21df7e54cbc8bdc99a Mon Sep 17 00:00:00 2001 From: Gordon Williams Date: Thu, 17 Feb 2022 13:39:35 +0000 Subject: [PATCH 1/2] > specificlly check for Jekyll markup > Add ability to scan the server for metadata.json files if no apps.json is present > Tidying up search box/chip handling to avoid global vars - just work out what to filter from window location each time > Under device info, show installed apps > Allow left-click and copy link for links > Merge pull request #18 from myxor/chips_quickfix --- core | 2 +- loader.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/core b/core index bf29f5697..a7a80a13f 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit bf29f5697445686255a785476e6b1ed6a13ff697 +Subproject commit a7a80a13fa187a4ff5f89669992babca2d95812c diff --git a/loader.js b/loader.js index 6b27736ae..82d6172cb 100644 --- a/loader.js +++ b/loader.js @@ -202,7 +202,6 @@ window.addEventListener('load', (event) => { } var selectLang = document.getElementById("settings-lang"); - console.log(languages); languages.forEach(lang => { selectLang.innerHTML += ``; }); From eb64a7a43653b0975e0d7dd5adb6aada3a542ad5 Mon Sep 17 00:00:00 2001 From: Gordon Williams Date: Thu, 17 Feb 2022 16:45:24 +0000 Subject: [PATCH 2/2] Fix build issues created with #1465 --- .eslintignore | 1 + apps/timecal/timecal.settings.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.eslintignore b/.eslintignore index e657b6260..7bbe41136 100644 --- a/.eslintignore +++ b/.eslintignore @@ -2,3 +2,4 @@ apps/animclk/V29.LBM.js apps/banglerun/rollup.config.js apps/schoolCalendar/fullcalendar/main.js apps/authentiwatch/qr_packed.js +*.test.js diff --git a/apps/timecal/timecal.settings.js b/apps/timecal/timecal.settings.js index 38c87903b..f3b46384d 100644 --- a/apps/timecal/timecal.settings.js +++ b/apps/timecal/timecal.settings.js @@ -21,7 +21,7 @@ }; validSttngs = require("Storage").readJSON("timecal.validSttngs.json", 1) || {}; for (const k in validSttngs) if (!DEFAULTS.hasOwnProperty(k)) delete this.validSttngs[k]; //remove invalid settings - for (const k in DEFAULTS) if(!validSttngs.hasOwnProperty(k)) validSttngs[k] = validSttngs[k]; //assign missing defaults + for (const k in DEFAULTS) if(!validSttngs.hasOwnProperty(k)) validSttngs[k] = DEFAULTS[k]; //assign missing defaults var changedSttngs = Object.assign({}, validSttngs);