service worker bugs fix

o2system · Nov 12, 2019 · 4ebf880 · 4ebf880
1 parent cdc8788
commit 4ebf880
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/resources/app.js b/resources/app.js
@@ -13,7 +13,7 @@ import "./app.scss";
 
 if ('serviceWorker' in navigator) {
     navigator.serviceWorker
-        .register('service-worker.js')
+        .register('/service-worker.js')
         .then(function(registration) {
             console.info(
                 'Service Worker registration successful with scope: ',

diff --git a/resources/service-worker.js b/resources/service-worker.js
@@ -9,20 +9,27 @@
  */
 // ------------------------------------------------------------------------
 
-const APP_NAME = '{{$appName}}';
-const THEME_NAME = '{{$themeName}}';
-const CACHE_NAME = '{{$cacheName}}';
+const APP_NAME = '{{ $appName }}';
+const CACHE_NAME = APP_NAME + '_cache';
+const THEME_NAME = '{{ $themeName }}';
 
 self.addEventListener('install', function(event) {
     console.info('[' + APP_NAME + '] Installing Service Worker ...', event);
     event.waitUntil(
         caches.open(CACHE_NAME).then(function(cache) {
-            cache.addAll([
-                '/themes/' + THEME_NAME + '/theme.css',
-                '/assets/app.css',
-                '/themes/' + THEME_NAME + '/theme.js',
-                '/assets/app.js'
-            ]);
+            if(THEME_NAME === '') {
+                cache.addAll([
+                    '/assets/app.css',
+                    '/assets/app.js'
+                ]);
+            } else {
+                cache.addAll([
+                    '/themes/' + THEME_NAME + '/theme.css',
+                    '/assets/app.css',
+                    '/themes/' + THEME_NAME + '/theme.js',
+                    '/assets/app.js'
+                ]);
+            }
         })
     );
 });