From 7e1a97e4f1943e458c806bf19cac556174a51319 Mon Sep 17 00:00:00 2001 From: rstular Date: Thu, 4 Jun 2020 16:20:22 +0200 Subject: Minor styling fixes --- assets/js/login.js | 3 ++- dist/js/app.js | 2 +- dist/js/login.js | 2 +- dist/pages/about.html | 2 +- dist/sw.js | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/assets/js/login.js b/assets/js/login.js index ab59058..fc6dfcd 100644 --- a/assets/js/login.js +++ b/assets/js/login.js @@ -33,7 +33,7 @@ function login() { dataType: "script", }); try { - gsecInstance = new gsec(); + gsecInstance = new gsec(); } catch (error) { alert(D("browserNotSupported")); } @@ -45,6 +45,7 @@ function login() { localforage.setItem("username", username), localforage.setItem("password", password) ]; + read_val(0); Promise.all(promises_to_run).then(function () { window.location.replace("/pages/timetable.html"); }); diff --git a/dist/js/app.js b/dist/js/app.js index d918e1c..4f1e88e 100755 --- a/dist/js/app.js +++ b/dist/js/app.js @@ -3,7 +3,7 @@ const app_version = "1.0.14.1-beta"; -const previous_commit = "cc82f7c592a75efaa57292e27f0596ce1ab1b6a6"; +const previous_commit = "a55ce514441b2dee1e0e8d2fdbcc1447fa56ad12"; if ("serviceWorker" in navigator) { navigator.serviceWorker.register("/sw.js") diff --git a/dist/js/login.js b/dist/js/login.js index 88cf081..2d79576 100644 --- a/dist/js/login.js +++ b/dist/js/login.js @@ -2,4 +2,4 @@ document.addEventListener("DOMContentLoaded",()=>{setupEventListeners();}) function setupEventListeners(){$("#login-button").click(()=>{login();});window.addEventListener("keyup",(event)=>{if(event.keyCode===13){event.preventDefault();login();}});} function login(){let username=$("#username").val();let password=$("#password").val();var gsecInstance;try{gsecInstance=new gsec();}catch(error){$.ajax({url:'js/gsec.js?ajaxload',async:false,dataType:"script",});try{gsecInstance=new gsec();}catch(error){alert(D("browserNotSupported"));}} -gsecInstance.login(username,password).then((value)=>{if(typeof value=="string"){let promises_to_run=[localforage.setItem("logged_in",true),localforage.setItem("username",username),localforage.setItem("password",password)];Promise.all(promises_to_run).then(function(){window.location.replace("/pages/timetable.html");});}else{UIAlert("loginFailed");$("#password").val("");}}).catch((err)=>{gsecErrorHandlerUI(err);$("#password").val("");});} \ No newline at end of file +gsecInstance.login(username,password).then((value)=>{if(typeof value=="string"){let promises_to_run=[localforage.setItem("logged_in",true),localforage.setItem("username",username),localforage.setItem("password",password)];read_val(0);Promise.all(promises_to_run).then(function(){window.location.replace("/pages/timetable.html");});}else{UIAlert("loginFailed");$("#password").val("");}}).catch((err)=>{gsecErrorHandlerUI(err);$("#password").val("");});} \ No newline at end of file diff --git a/dist/pages/about.html b/dist/pages/about.html index ddc8e7a..4887e48 100755 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -142,7 +142,7 @@

- ^HEAD cc82f7c592a75efaa57292e27f0596ce1ab1b6a6 + ^HEAD a55ce514441b2dee1e0e8d2fdbcc1447fa56ad12

diff --git a/dist/sw.js b/dist/sw.js index 33c6352..88e3798 100755 --- a/dist/sw.js +++ b/dist/sw.js @@ -3,8 +3,8 @@ // Change version to cause cache refresh -const static_cache_name = "site-static-1.0.14.1-beta-cc82f7c"; -// commit before the latest is cc82f7c592a75efaa57292e27f0596ce1ab1b6a6 +const static_cache_name = "site-static-1.0.14.1-beta-a55ce51"; +// commit before the latest is a55ce514441b2dee1e0e8d2fdbcc1447fa56ad12 // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js // sw.js NE SME BITI CACHAN, ker vsebuje verzijo! -- cgit v1.2.3