From a5248f0f398146236d3ba14418363d0134673a8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Wed, 14 Mar 2018 22:13:03 +0100
Subject: [PATCH] Fixed service-worker issues

---
 server/public/assets/js/admin.js     |  2 +-
 server/public/assets/js/listeners.js |  8 ++++----
 server/public/service-worker.js      | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/server/public/assets/js/admin.js b/server/public/assets/js/admin.js
index b6a0e17a..d67cb944 100755
--- a/server/public/assets/js/admin.js
+++ b/server/public/assets/js/admin.js
@@ -233,7 +233,7 @@ var Admin = {
     shuffle: function() {
         if(!offline) {
             //var u = Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true);
-            if(u == undefined) u = "";
+            //if(u == undefined) u = "";
             emit('shuffle', {channel: chan.toLowerCase()});
         } else {
             for(var x = 0; x < full_playlist.length; x++){
diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js
index 96a6f626..eeea9b6c 100755
--- a/server/public/assets/js/listeners.js
+++ b/server/public/assets/js/listeners.js
@@ -118,7 +118,7 @@ var fromFront = false;
 var fromChannel = false;
 
 try{
-    /*if (navigator.serviceWorker && window.location.host != "zoff.dev") {
+    if (navigator.serviceWorker && window.location.host != "zoff.dev") {
         navigator.serviceWorker.register('/service-worker.js', {scope: '/'})
         .then(function (registration) {
             Helper.log(registration);
@@ -128,13 +128,13 @@ try{
         });
     } else {
         Helper.log('Service Worker is not supported in this browser.');
-    }*/
-
+    }
+/*
     navigator.serviceWorker.getRegistration('/').then(function(registration) {
         if(registration) {
             registration.unregister();
         }
-    });
+    });*/
 
 } catch(e) {}
 
diff --git a/server/public/service-worker.js b/server/public/service-worker.js
index 56dbda5d..98880153 100755
--- a/server/public/service-worker.js
+++ b/server/public/service-worker.js
@@ -1,8 +1,8 @@
-var version = 'v3.9';
+var version = 'v5.0';
 var CACHE_FILES = [
     '/assets/html/offline.html',
     '/assets/manifest.json',
-    '/assets/images/favicon.png'
+    '/assets/images/favicon.ico'
 ];
 
 self.addEventListener("install", function(event) {
@@ -38,16 +38,16 @@ self.addEventListener('fetch', event => {
         (event.request.headers.get('accept').includes('text/html') ||
          event.request.headers.get('accept').includes('text/css') ||
             (event.request.headers.get('accept').includes('*/*') &&
-                (event.request.url.includes('localhost') || event.request.url.includes('zoff.no') || event.request.url.includes('zoff.me')))))) {
+                (event.request.url.includes('localhost') || event.request.url.includes('zoff.me')))))) {
     event.respondWith(
-      fetch(event.request.url, {redirect: 'manual'}).catch(error => {
+      fetch(event.request).catch(error => {
         if(event.request.url.includes('manifest.json')){
           return caches.open(version + "::zoff").then(function(cache) {
               return cache.match("/assets/manifest.json");
           });
         } else if (event.request.url.includes('favicon')) {
           return caches.open(version + "::zoff").then(function(cache) {
-              return cache.match("/assets/images/favicon.png");
+              return cache.match("/assets/images/favicon.ico");
           });
         } else if (event.request.url.includes('service-worker')) {
           return caches.open(version + "::zoff").then(function(cache) {