Merge pull request #2669 from thyttan/quicklaunch

[Quicklaunch] Compatibility with 'Fastload Utils' App History feature by checking …
espruino · Jul 3, 2023 · 12dbad0 · 12dbad0
2 parents 78d95a0 + 74091b6
commit 12dbad0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/apps/quicklaunch/ChangeLog b/apps/quicklaunch/ChangeLog
@@ -15,3 +15,4 @@
 	new key names.
 0.13: Touch and hold to pause the timeout to clock temporarily.
 0.14: Extension: Don't go down a path if nothing waits at the end. Revisit the current intersection instead.
+0.15: Extension: Compatibility with "Fastload Utils" app history feature.
diff --git a/apps/quicklaunch/app.js b/apps/quicklaunch/app.js
@@ -24,7 +24,7 @@
     }
   };
 
-  let trace = settings.trace;
+  let trace = (settings[settings.trace+"app"].src=="quicklaunch.app.js") ? settings.trace : settings.trace.substring(0, settings.trace.length-1); // If the stored trace leads beyond extension screens, walk back to the last extension screen. Compatibility with "Fastload Utils" App History feature.
 
   let touchHandler = (_,e) => {
     if (e.type == 2) return;

diff --git a/apps/quicklaunch/metadata.json b/apps/quicklaunch/metadata.json
@@ -2,7 +2,7 @@
   "id": "quicklaunch",
   "name": "Quick Launch",
   "icon": "app.png",
-  "version": "0.14",
+  "version": "0.15",
   "description": "Tap or swipe left/right/up/down on your clock face to launch up to five apps of your choice. Configurations can be accessed through Settings->Apps.",
   "type": "bootloader",
   "tags": "tools, system",