diff options
| author | Daniel Friesel <daniel.friesel@uos.de> | 2019-05-07 17:56:40 +0200 | 
|---|---|---|
| committer | Daniel Friesel <daniel.friesel@uos.de> | 2019-05-07 17:56:40 +0200 | 
| commit | 76bd6763df24b0002a2f7a89de3fe8fcbb9d95e0 (patch) | |
| tree | 1ab082a593e46002b724d79fe874baa9f9b25629 /public/static | |
| parent | bd676674e9ada084e914edc4b67fef63cc110901 (diff) | |
only show loading animation on links without custom animation1.1.7
Diffstat (limited to 'public/static')
| -rw-r--r-- | public/static/css/material-icons.css | 8 | ||||
| -rw-r--r-- | public/static/js/travelynx-actions.js | 2 | ||||
| -rw-r--r-- | public/static/js/travelynx-actions.min.js | 2 | ||||
| -rw-r--r-- | public/static/manifest.json | 12 | ||||
| l--------- | public/static/v15 (renamed from public/static/v13) | 0 | 
5 files changed, 12 insertions, 12 deletions
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  | 
