KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2026-02-10 19:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed service-worker issues

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-03-14 22:13:03 +01:00
parent 15532d8f9a
commit a5248f0f39
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/public/assets/js/admin.js
View File

@@ -233,7 +233,7 @@ var Admin = {
shuffle: function() { shuffle: function() {
if(!offline) { if(!offline) {
//var u = Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true); //var u = Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()), true);
if(u == undefined) u = ""; //if(u == undefined) u = "";
emit('shuffle', {channel: chan.toLowerCase()}); emit('shuffle', {channel: chan.toLowerCase()});
} else { } else {
for(var x = 0; x < full_playlist.length; x++){ for(var x = 0; x < full_playlist.length; x++){

8
server/public/assets/js/listeners.js
View File

@@ -118,7 +118,7 @@ var fromFront = false;
var fromChannel = false; var fromChannel = false;
try{ try{
/*if (navigator.serviceWorker && window.location.host != "zoff.dev") { if (navigator.serviceWorker && window.location.host != "zoff.dev") {
navigator.serviceWorker.register('/service-worker.js', {scope: '/'}) navigator.serviceWorker.register('/service-worker.js', {scope: '/'})
.then(function (registration) { .then(function (registration) {
Helper.log(registration); Helper.log(registration);
@@ -128,13 +128,13 @@ try{
}); });
} else { } else {
Helper.log('Service Worker is not supported in this browser.'); Helper.log('Service Worker is not supported in this browser.');
}*/ }
/*
navigator.serviceWorker.getRegistration('/').then(function(registration) { navigator.serviceWorker.getRegistration('/').then(function(registration) {
if(registration) { if(registration) {
registration.unregister(); registration.unregister();
} }
}); });*/
} catch(e) {} } catch(e) {}

10
server/public/service-worker.js
View File

@@ -1,8 +1,8 @@
var version = 'v3.9'; var version = 'v5.0';
var CACHE_FILES = [ var CACHE_FILES = [
'/assets/html/offline.html', '/assets/html/offline.html',
'/assets/manifest.json', '/assets/manifest.json',
'/assets/images/favicon.png' '/assets/images/favicon.ico'
]; ];
self.addEventListener("install", function(event) { 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/html') ||
event.request.headers.get('accept').includes('text/css') || event.request.headers.get('accept').includes('text/css') ||
(event.request.headers.get('accept').includes('*/*') && (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( event.respondWith(
fetch(event.request.url, {redirect: 'manual'}).catch(error => { fetch(event.request).catch(error => {
if(event.request.url.includes('manifest.json')){ if(event.request.url.includes('manifest.json')){
return caches.open(version + "::zoff").then(function(cache) { return caches.open(version + "::zoff").then(function(cache) {
return cache.match("/assets/manifest.json"); return cache.match("/assets/manifest.json");
}); });
} else if (event.request.url.includes('favicon')) { } else if (event.request.url.includes('favicon')) {
return caches.open(version + "::zoff").then(function(cache) { 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')) { } else if (event.request.url.includes('service-worker')) {
return caches.open(version + "::zoff").then(function(cache) { return caches.open(version + "::zoff").then(function(cache) {