From adfedee25f307b6a63803c610af2d53eff8a2dd4 Mon Sep 17 00:00:00 2001
From: Frederik Milling Pytlick <54995208+frederikpyt@users.noreply.github.com>
Date: Mon, 30 Nov 2020 21:13:20 +0100
Subject: [PATCH] v1.5.1 - Fixed caching

---
 .../public/serviceWorkerCachedWebpags.js      | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

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) {