summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <daniel.friesel@uos.de>2019-05-07 17:56:40 +0200
committerDaniel Friesel <daniel.friesel@uos.de>2019-05-07 17:56:40 +0200
commit76bd6763df24b0002a2f7a89de3fe8fcbb9d95e0 (patch)
tree1ab082a593e46002b724d79fe874baa9f9b25629
parentbd676674e9ada084e914edc4b67fef63cc110901 (diff)
only show loading animation on links without custom animation1.1.7
-rw-r--r--public/service-worker.js18
-rw-r--r--public/static/css/material-icons.css8
-rw-r--r--public/static/js/travelynx-actions.js2
-rw-r--r--public/static/js/travelynx-actions.min.js2
-rw-r--r--public/static/manifest.json12
l---------public/static/v15 (renamed from public/static/v13)0
-rw-r--r--templates/layouts/default.html.ep2
7 files changed, 22 insertions, 22 deletions
diff --git a/public/service-worker.js b/public/service-worker.js
index a7a49a8..0374101 100644
--- a/public/service-worker.js
+++ b/public/service-worker.js
@@ -1,14 +1,14 @@
-const CACHE_NAME = 'static-cache-v14';
+const CACHE_NAME = 'static-cache-v15';
const FILES_TO_CACHE = [
'/offline.html',
- '/static/v14/css/materialize.min.css',
- '/static/v14/css/material-icons.css',
- '/static/v14/css/local.css',
- '/static/v14/js/jquery-3.4.1.min.js',
- '/static/v14/js/materialize.min.js',
- '/static/v14/js/travelynx-actions.min.js',
- '/static/v14/js/autocomplete.min.js',
- '/static/v14/js/geolocation.min.js',
+ '/static/v15/css/materialize.min.css',
+ '/static/v15/css/material-icons.css',
+ '/static/v15/css/local.css',
+ '/static/v15/js/jquery-3.4.1.min.js',
+ '/static/v15/js/materialize.min.js',
+ '/static/v15/js/travelynx-actions.min.js',
+ '/static/v15/js/autocomplete.min.js',
+ '/static/v15/js/geolocation.min.js',
];
self.addEventListener('install', (evt) => {
diff --git a/public/static/css/material-icons.css b/public/static/css/material-icons.css
index 3287b4e..f6adb7c 100644
--- a/public/static/css/material-icons.css
+++ b/public/static/css/material-icons.css
@@ -2,12 +2,12 @@
font-family: 'Material Icons';
font-style: normal;
font-weight: 400;
- src: url(/static/v14/fonts/MaterialIcons-Regular.eot); /* For IE6-8 */
+ src: url(/static/v15/fonts/MaterialIcons-Regular.eot); /* For IE6-8 */
src: local('Material Icons'),
local('MaterialIcons-Regular'),
- url(/static/v14/fonts/MaterialIcons-Regular.woff2) format('woff2'),
- url(/static/v14/fonts/MaterialIcons-Regular.woff) format('woff'),
- url(/static/v14/fonts/MaterialIcons-Regular.ttf) format('truetype');
+ url(/static/v15/fonts/MaterialIcons-Regular.woff2) format('woff2'),
+ url(/static/v15/fonts/MaterialIcons-Regular.woff) format('woff'),
+ url(/static/v15/fonts/MaterialIcons-Regular.ttf) format('truetype');
}
.material-icons {
diff --git a/public/static/js/travelynx-actions.js b/public/static/js/travelynx-actions.js
index e7ac84c..2dcca46 100644
--- a/public/static/js/travelynx-actions.js
+++ b/public/static/js/travelynx-actions.js
@@ -110,7 +110,7 @@ $(document).ready(function() {
if ($('.publicstatuscol .autorefresh').length) {
setTimeout(tvly_update_public, 20000);
}
- $(window).on('beforeunload', function () {
+ $('a[href]').click(function() {
$('nav .preloader-wrapper').addClass('active');
});
});
diff --git a/public/static/js/travelynx-actions.min.js b/public/static/js/travelynx-actions.min.js
index e207b50..2a8ea78 100644
--- a/public/static/js/travelynx-actions.min.js
+++ b/public/static/js/travelynx-actions.min.js
@@ -1 +1 @@
-function tvly_run(t,a,e){var n='<i class="material-icons">error</i>',c=$('<div class="progress"><div class="indeterminate"></div></div>');t.hide(),t.after(c),$.post("/action",a,function(a){a.success?$(location).attr("href",a.redirect_to):(M.toast({html:n+" "+a.error}),c.remove(),e&&e(),t.append(" "+n),t.show())})}function tvly_update(){$.get("/ajax/status_card.html",function(t){$(".statuscol").html(t),tvly_reg_handlers(),setTimeout(tvly_update,2e4)}).fail(function(){$(".sync-failed-marker").css("display","block"),setTimeout(tvly_update,2e4)})}function tvly_update_public(){var t;$(".publicstatuscol").each(function(){t=$(this).data("user")}),$.get("/ajax/status/"+t+".html",function(t){$(".publicstatuscol").html(t),setTimeout(tvly_update_public,2e4)}).fail(function(){$(".sync-failed-marker").css("display","block"),setTimeout(tvly_update_public,2e4)})}function tvly_reg_handlers(){$(".action-checkin").click(function(){var t=$(this);tvly_run(t,{action:"checkin",station:t.data("station"),train:t.data("train")})}),$(".action-checkout").click(function(){var t=$(this),a={action:"checkout",station:t.data("station"),force:t.data("force")};tvly_run(t,a,function(){t.append(" – Ohne Echtzeitdaten auschecken?"),t.data("force",!0)})}),$(".action-undo").click(function(){var t=$(this);tvly_run(t,{action:"undo",undo_id:t.data("id")})}),$(".action-cancelled-from").click(function(){var t=$(this);tvly_run(t,{action:"cancelled_from",station:t.data("station"),train:t.data("train")})}),$(".action-cancelled-to").click(function(){var t=$(this);tvly_run(t,{action:"cancelled_to",station:t.data("station"),force:!0})}),$(".action-delete").click(function(){var t=$(this),a={action:"delete",id:t.data("id"),checkin:t.data("checkin"),checkout:t.data("checkout")};really_delete=confirm("Diese Zugfahrt wirklich löschen? Der Eintrag wird sofort aus der Datenbank entfernt und kann nicht wiederhergestellt werden."),really_delete&&tvly_run(t,a)})}$(document).ready(function(){tvly_reg_handlers(),$(".statuscol .autorefresh").length&&setTimeout(tvly_update,2e4),$(".publicstatuscol .autorefresh").length&&setTimeout(tvly_update_public,2e4),$(window).on("beforeunload",function(){$("nav .preloader-wrapper").addClass("active")})});
+function tvly_run(a,t,e){var c='<i class="material-icons">error</i>',n=$('<div class="progress"><div class="indeterminate"></div></div>');a.hide(),a.after(n),$.post("/action",t,function(t){t.success?$(location).attr("href",t.redirect_to):(M.toast({html:c+" "+t.error}),n.remove(),e&&e(),a.append(" "+c),a.show())})}function tvly_update(){$.get("/ajax/status_card.html",function(t){$(".statuscol").html(t),tvly_reg_handlers(),setTimeout(tvly_update,2e4)}).fail(function(){$(".sync-failed-marker").css("display","block"),setTimeout(tvly_update,2e4)})}function tvly_update_public(){var t;$(".publicstatuscol").each(function(){t=$(this).data("user")}),$.get("/ajax/status/"+t+".html",function(t){$(".publicstatuscol").html(t),setTimeout(tvly_update_public,2e4)}).fail(function(){$(".sync-failed-marker").css("display","block"),setTimeout(tvly_update_public,2e4)})}function tvly_reg_handlers(){$(".action-checkin").click(function(){var t=$(this);tvly_run(t,{action:"checkin",station:t.data("station"),train:t.data("train")})}),$(".action-checkout").click(function(){var t=$(this),a={action:"checkout",station:t.data("station"),force:t.data("force")};tvly_run(t,a,function(){t.append(" – Ohne Echtzeitdaten auschecken?"),t.data("force",!0)})}),$(".action-undo").click(function(){var t=$(this);tvly_run(t,{action:"undo",undo_id:t.data("id")})}),$(".action-cancelled-from").click(function(){var t=$(this);tvly_run(t,{action:"cancelled_from",station:t.data("station"),train:t.data("train")})}),$(".action-cancelled-to").click(function(){var t=$(this);tvly_run(t,{action:"cancelled_to",station:t.data("station"),force:!0})}),$(".action-delete").click(function(){var t=$(this),a={action:"delete",id:t.data("id"),checkin:t.data("checkin"),checkout:t.data("checkout")};really_delete=confirm("Diese Zugfahrt wirklich löschen? Der Eintrag wird sofort aus der Datenbank entfernt und kann nicht wiederhergestellt werden."),really_delete&&tvly_run(t,a)})}$(document).ready(function(){tvly_reg_handlers(),$(".statuscol .autorefresh").length&&setTimeout(tvly_update,2e4),$(".publicstatuscol .autorefresh").length&&setTimeout(tvly_update_public,2e4),$("a[href]").click(function(){$("nav .preloader-wrapper").addClass("active")})});
diff --git a/public/static/manifest.json b/public/static/manifest.json
index 221e283..da3c185 100644
--- a/public/static/manifest.json
+++ b/public/static/manifest.json
@@ -3,27 +3,27 @@
"short_name": "Travelynx",
"scope": "/",
"icons": [{
- "src": "/static/v14/icons/icon-128x128.png",
+ "src": "/static/v15/icons/icon-128x128.png",
"sizes": "128x128",
"type": "image/png"
}, {
- "src": "/static/v14/icons/icon-144x144.png",
+ "src": "/static/v15/icons/icon-144x144.png",
"sizes": "144x144",
"type": "image/png"
}, {
- "src": "/static/v14/icons/icon-152x152.png",
+ "src": "/static/v15/icons/icon-152x152.png",
"sizes": "152x152",
"type": "image/png"
}, {
- "src": "/static/v14/icons/icon-192x192.png",
+ "src": "/static/v15/icons/icon-192x192.png",
"sizes": "192x192",
"type": "image/png"
}, {
- "src": "/static/v14/icons/icon-256x256.png",
+ "src": "/static/v15/icons/icon-256x256.png",
"sizes": "256x256",
"type": "image/png"
}, {
- "src": "/static/v14/icons/icon-512x512.png",
+ "src": "/static/v15/icons/icon-512x512.png",
"sizes": "512x512",
"type": "image/png"
}],
diff --git a/public/static/v13 b/public/static/v15
index 945c9b4..945c9b4 120000
--- a/public/static/v13
+++ b/public/static/v15
diff --git a/templates/layouts/default.html.ep b/templates/layouts/default.html.ep
index 4f35183..fb77eec 100644
--- a/templates/layouts/default.html.ep
+++ b/templates/layouts/default.html.ep
@@ -9,7 +9,7 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="apple-mobile-web-app-title" content="Weather PWA">
- % my $av = 'v14'; # asset version
+ % my $av = 'v15'; # asset version
<link rel="apple-touch-icon" href="/static/<%= $av %>/icons/icon-152x152.png">
<link rel="manifest" href="/static/<%= $av %>/manifest.json">
%= stylesheet "/static/${av}/css/materialize.min.css"