More changes to automatic update checker notification

qkmaxware · May 14, 2021 · 8d3b406 · 8d3b406
1 parent 97ab91f
commit 8d3b406
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/TrekSharp.AdventureTools/wwwroot/index.html b/TrekSharp.AdventureTools/wwwroot/index.html
@@ -25,7 +25,7 @@
 
 <body>
     <div id="pwa-update-notification" class="notification w3-hide">
-        A new version is available <a id="pwa-update-refresh" href="" onclick="window.location.reload();" class="w3-text-blue">REFRESH</a> <a style="text-decoration: none;" href="" onclick="hidePwaUpdate(); return false;">&times;</a>
+        A new version is available <a id="pwa-update-refresh" href="" onclick="reloadPwa();" class="w3-text-blue">REFRESH</a> <a style="text-decoration: none;" href="" onclick="hidePwaUpdate(); return false;">&times;</a>
     </div>
     <app>
         <div class="w3-center w3-padding w3-margin-top">
@@ -48,9 +48,15 @@
             note.classList.add("w3-hide");
             note.classList.remove("w3-show");
         }
+        let newWorker;
+        function reloadPwa() {
+            if (newWorker) {
+                newWorker.postMessage({ action: 'skipWaiting' });
+            }
+        }
         navigator.serviceWorker.register('service-worker.js').then(reg => {
             reg.addEventListener('updatefound', () => {
-                let newWorker = reg.installing;
+                newWorker = reg.installing;
                 newWorker.addEventListener('statechange', () => {
                     switch (newWorker.state) {
                         case "installed":
@@ -63,6 +69,13 @@
                 });
             });
         });
+        let pwaRefreshing = false;
+        navigator.serviceWorker.addEventListener('controllerchange', function () {
+            if (pwaRefreshing) 
+                return;
+            window.location.reload();
+            pwaRefreshing = true;
+        });
     </script>
     <script src="js/helpers.js"></script>
     <script>