various offline mode fixes related to service worker initialization

2 files changed, 2 insertions, 30 deletions

diff --git a/js/app.js b/js/app.js
index 25e3ce2..941ed1b 100644
--- a/js/app.js
+++ b/js/app.js
@@ -54,12 +54,6 @@ const App = {
         App.initOfflineEvents();

 

         if ('serviceWorker' in navigator) {

-            navigator.serviceWorker

-                .register('worker.js?<?php echo time() ?>')

-                .then(function() {

-                    console.log("service worker registered");

-                });

-

             navigator.serviceWorker.addEventListener('message', function(event) {

 

                 if (event.data == 'refresh-started') {

@@ -247,14 +241,6 @@ const App = {
             App.initNightMode();

             App.initOfflineEvents();

 

-            if ('serviceWorker' in navigator) {

-                navigator.serviceWorker

-                    .register('worker.js')

-                    .then(function() {

-                        console.log("service worker registered");

-                    });

-            }

-

             const query = $.urlParam("query");

 

             if (query)

diff --git a/js/reader.js b/js/reader.js
index d58b9d2..a2ee32e 100644
--- a/js/reader.js
+++ b/js/reader.js
@@ -8,18 +8,6 @@ const DEFAULT_LINE_HEIGHT = 140;
 
 const Reader = {
 	init: function() {
-		if ('serviceWorker' in navigator) {
-			navigator.serviceWorker
-				.register('worker.js')
-				.then(function() {
-					console.log("service worker registered");
-
-					Reader.Loader.init();
-				});
-		} else {
-			alert("Service worker support missing in browser (are you using plain HTTP?).");
-		}
-
 		$(document).on("keyup", function(e) {
 			Reader.hotkeyHandler(e);
 		});
@@ -31,6 +19,8 @@ const Reader = {
 		$("#right").on("mouseup", function() {
 			Reader.Page.next();
 		});
+
+		Reader.Loader.init();
 	},
 	initSecondStage: function() {
 
@@ -1015,10 +1005,6 @@ const Reader = {
 	}
 };
 
-$(document).ready(function() {
-	Reader.init();
-});
-
 function __get_reader() {
 	return Reader;
 }
\ No newline at end of file