summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--index.php25
-rw-r--r--js/app.js14
-rw-r--r--js/reader.js18
-rw-r--r--offline.html25
-rw-r--r--read.html18
-rw-r--r--worker.js1
6 files changed, 56 insertions, 45 deletions
diff --git a/index.php b/index.php
index c8dc9e0..6f651cb 100644
--- a/index.php
+++ b/index.php
@@ -65,6 +65,24 @@
<link rel="manifest" href="manifest.json">
<meta name="mobile-web-app-capable" content="yes">
<script src="js/app.js?<?php echo time() ?>"></script>
+ <script type="text/javascript">
+ 'use strict';
+
+ if ('serviceWorker' in navigator) {
+ navigator.serviceWorker
+ .register('worker.js')
+ .then(function() {
+ console.log("service worker registered");
+
+ $(document).ready(function() {
+ App.index_mode = "<?php echo $mode ?>";
+ App.init();
+ });
+ });
+ } else {
+ alert("Service worker support missing in browser (are you using plain HTTP?).");
+ }
+ </script>
</head>
<body>
@@ -132,13 +150,6 @@
<div class="epube-app-filler"></div>
-<script type="text/javascript">
- $(document).ready(function() {
- App.index_mode = "<?php echo $mode ?>";
- App.init();
- });
-</script>
-
<div class="container container-main">
<div class="modal fade" id="summary-modal" tabindex="-1" role="dialog">
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
diff --git a/offline.html b/offline.html
index 8fe8907..e94bded 100644
--- a/offline.html
+++ b/offline.html
@@ -15,6 +15,23 @@
<link rel="manifest" href="manifest.json">
<meta name="mobile-web-app-capable" content="yes">
<script src="js/app.js"></script>
+ <script type="text/javascript">
+ 'use strict';
+
+ if ('serviceWorker' in navigator) {
+ navigator.serviceWorker
+ .register('worker.js')
+ .then(function() {
+ console.log("service worker registered");
+
+ $(document).ready(function() {
+ App.Offline.init();
+ });
+ });
+ } else {
+ alert("Service worker support missing in browser (are you using plain HTTP?).");
+ }
+ </script>
</head>
<body>
@@ -63,14 +80,6 @@
<div class="epube-app-filler"></div>
-<script type="text/javascript">
- 'use strict';
-
- $(document).ready(function() {
- App.Offline.init();
- });
-</script>
-
<div class="container">
<div class="modal fade" id="summary-modal" tabindex="-1" role="dialog">
diff --git a/read.html b/read.html
index 9114145..82ca509 100644
--- a/read.html
+++ b/read.html
@@ -22,6 +22,24 @@
<link type="text/css" rel="stylesheet" media="screen" href="css/read.css" />
<link type="text/css" rel="stylesheet" media="screen" href="themes/default.css" id="theme_css" />
+
+ <script type="text/javascript">
+ 'use strict';
+
+ if ('serviceWorker' in navigator) {
+ navigator.serviceWorker
+ .register('worker.js')
+ .then(function() {
+ console.log("service worker registered");
+
+ $(document).ready(function() {
+ Reader.init();
+ });
+ });
+ } else {
+ alert("Service worker support missing in browser (are you using plain HTTP?).");
+ }
+ </script>
</head>
<body>
diff --git a/worker.js b/worker.js
index 65c39e6..a2b9f59 100644
--- a/worker.js
+++ b/worker.js
@@ -4,6 +4,7 @@ const CACHE_PREFIX = 'epube';
const CACHE_NAME = CACHE_PREFIX + '-v2';
const CACHE_URLS = [
'manifest.json',
+ 'worker.js',
'img/ic_launcher_web.png',
'img/favicon.png',
'read.html',