diff --git a/skolehjem/public/serviceWorkerCachedWebpags.js b/skolehjem/public/serviceWorkerCachedWebpags.js index 279db5c..124bd78 100644 --- a/skolehjem/public/serviceWorkerCachedWebpags.js +++ b/skolehjem/public/serviceWorkerCachedWebpags.js @@ -58,18 +58,22 @@ self.addEventListener('activate', evt => { self.addEventListener('fetch', evt => { console.log('fetch event'); - evt.respondWith( - caches.match(evt.request).then(cacheRes => { - return cacheRes || fetch(evt.request).then(fetchRes => { + + if(!navigator.onLine) + evt.respondWith( + caches.match(evt.request).then(cacheRes => { + return cacheRes || caches.match('/offline.html'); + }) + ); + else + evt.respondWith( + fetch(evt.request).then(fetchRes => { return caches.open(dynamicCacheName).then(cache => { cache.put(evt.request.url, fetchRes.clone()); return fetchRes; }) - }); - }).catch(function () { - return caches.match('/offline.html'); - }) - ); + }) + ); }); self.addEventListener('push', function(event) {