From 6d7ffa72fa50fbc9a249c747e2e5f11ab23cd6f0 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Fri, 11 Nov 2022 14:26:53 +0000
Subject: [PATCH] Added option for minification of apps. as mentioned on
 https://forum.espruino.com/conversations/381203/?offset=25#comment16758675

---
 core       |  2 +-
 index.html |  4 ++++
 loader.js  | 10 +++++++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/core b/core
index 278071c7e..84c02f505 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 278071c7e270eca596b5e2f3573241e1c295534a
+Subproject commit 84c02f505f127071a1d19165bd960731cc9489f5
diff --git a/index.html b/index.html
index c64026a1f..f1983bd44 100644
--- a/index.html
+++ b/index.html
@@ -145,6 +145,10 @@
             <input type="checkbox" id="settings-pretokenise">
             <i class="form-icon"></i> Pretokenise apps before upload (smaller, faster apps)
           </label>
+          <label class="form-switch">
+            <input type="checkbox" id="settings-minify">
+            <i class="form-icon"></i> Minify apps before upload (smaller, faster apps - BETA)
+          </label>
           <label class="form-switch">
             <input type="checkbox" id="settings-settime">
             <i class="form-icon"></i> Always update time when we connect
diff --git a/loader.js b/loader.js
index 9b337223b..251f94ff1 100644
--- a/loader.js
+++ b/loader.js
@@ -206,7 +206,9 @@ window.addEventListener('load', (event) => {
   // Button to install all default apps in one go
   document.getElementById("reinstallall").addEventListener("click",event=>{
     var promise =  showPrompt("Reinstall","Really re-install all apps?").then(() => {
-      getInstalledApps().then(installedapps => {
+      Comms.reset().then(_ =>
+        getInstalledApps()
+      ).then(installedapps => {
         console.log(installedapps);
         var promise = Promise.resolve();
         installedapps.forEach(app => {
@@ -216,10 +218,12 @@ window.addEventListener('load', (event) => {
           app = appJSON.find(a => a.id==oldApp.id);
           if (!app)
             return console.log(`Ignoring ${oldApp.id} as not found`);
-          promise = promise.then(() => updateApp(app));
+          promise = promise.then(() => updateApp(app, {noReset:true, noFinish:true}));
         });
         return promise;
-      }).catch(err=>{
+      }).then( _ =>
+        Comms.showUploadFinished()
+      ).catch(err=>{
         Progress.hide({sticky:true});
         showToast("App re-install failed, "+err,"error");
       });