Merge branch 'espruino:master' into master

apps/dtlaunch/ChangeLog

@@ -21,3 +21,6 @@ back-functionality through setUI, adding the red back button as well. Hardware
 button to exit is no longer an option.
 0.19: Bangle 2: Utilize new Bangle.load(), Bangle.showClock() functions to
 facilitate 'fast switching' of apps where available.
+0.20: Bangle 2: Revert use of Bangle.load() to classic load() calls since
+widgets would still be loaded when they weren't supposed to.
+

apps/dtlaunch/app-b2.js

@@ -119,7 +119,7 @@ let touchListenerDt = function(_,p){
                     if (selected!=i && !settings.direct){
                         drawIcon(page,selected,false);
                     } else {
-                        Bangle.load(apps[page*4+i].src);
+                        load(apps[page*4+i].src);
                     }
                 }
                 selected=i;

apps/dtlaunch/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "dtlaunch",
   "name": "Desktop Launcher",
-  "version": "0.19",
+  "version": "0.20",
   "description": "Desktop style App Launcher with six (four for Bangle 2) apps per page - fast access if you have lots of apps installed.",
   "screenshots": [{"url":"shot1.png"},{"url":"shot2.png"},{"url":"shot3.png"}],
   "icon": "icon.png",

apps/iconlaunch/ChangeLog

@@ -15,3 +15,4 @@
 0.11: Cleanup timeout when changing to clock
       Reset timeout on swipe and drag
 0.12: Use Bangle.load and Bangle.showClock
+0.13: Fix automatic switch to clock

apps/iconlaunch/app.js

@@ -198,7 +198,7 @@
   if (settings.timeOut!="Off"){
       let time=parseInt(settings.timeOut);  //the "s" will be trimmed by the parseInt
       if (timeout) clearTimeout(timeout);
-      timeout = setTimeout(returnToClock,time*1000);
+      timeout = setTimeout(Bangle.showClock,time*1000);
     }
   };
 

apps/iconlaunch/metadata.json

@@ -2,7 +2,7 @@
 	"id": "iconlaunch",
 	"name": "Icon Launcher",
 	"shortName" : "Icon launcher",
-	"version": "0.12",
+	"version": "0.13",
 	"icon": "app.png",
 	"description": "A launcher inspired by smartphones, with an icon-only scrollable menu.",
 	"tags": "tool,system,launcher",