fixup! cache webapp using a service worker to enable offline startup

fossar · Aug 21, 2018 · 417bf48 · 417bf48
1 parent 9844c8b
commit 417bf48
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/helpers/View.php b/helpers/View.php
@@ -306,7 +306,7 @@ public function genOfflineSW() {
 
             fwrite($f, "var offlineManifest = {\n");
             fwrite($f, "    subdir: '" . $subdir . "',\n");
-            fwrite($f, "    version: " . $staticmtime . ",\n");
+            fwrite($f, '    version: ' . $staticmtime . ",\n");
             fwrite($f, "    files: [\n");
             fwrite($f, "        '" . $subdir . "',\n");
 

diff --git a/public/js/selfoss-base.js b/public/js/selfoss-base.js
@@ -43,14 +43,14 @@ var selfoss = {
             window.addEventListener('load', function() {
                 navigator.serviceWorker.register('selfoss-sw-offline.js')
                     .then(function(reg) {
-                    selfoss.listenWaitingSW(reg, function(reg) {
-                        selfoss.ui.notifyNewVersion(function() {
-                            if (reg.waiting) {
-                                reg.waiting.postMessage('skipWaiting');
-                            }
+                        selfoss.listenWaitingSW(reg, function(reg) {
+                            selfoss.ui.notifyNewVersion(function() {
+                                if (reg.waiting) {
+                                    reg.waiting.postMessage('skipWaiting');
+                                }
+                            });
                         });
                     });
-                });
             });
 
             navigator.serviceWorker.addEventListener('controllerchange',
@@ -602,11 +602,9 @@ var selfoss = {
 
         if (!reg) {
             return;
-        }
-        else if (reg.waiting) {
+        } else if (reg.waiting) {
             return callback(reg);
-        }
-        else if (reg.installing) {
+        } else if (reg.installing) {
             awaitStateChange();
             reg.addEventListener('updatefound', awaitStateChange);
         }

diff --git a/public/js/selfoss-sw-offline.js b/public/js/selfoss-sw-offline.js
@@ -1,3 +1,7 @@
+/* ServiceWorker environment, and prepended script */
+/* global offlineManifest:false, Promise */
+
+
 self.addEventListener('install', function(event) {
     event.waitUntil(
         caches.open(offlineManifest.version).then(function(cache) {

diff --git a/public/js/selfoss-ui.js b/public/js/selfoss-ui.js
@@ -286,7 +286,7 @@ selfoss.ui = {
 
 
     notifyNewVersion: function(cb) {
-        cb = (typeof cb !== 'undefined') ? cb: false;
+        cb = (typeof cb !== 'undefined') ? cb : false;
 
         if (!cb) {
             cb = function() {
@@ -295,10 +295,10 @@ selfoss.ui = {
         }
 
         selfoss.ui.showMessage('selfoss has been updated, please reload',
-                               'Reload',
-                               function() {
-            cb();
-        });
+            'Reload',
+            function() {
+                cb();
+            });
     },