diff options
| -rw-r--r-- | assets/js/login.js | 3 | ||||
| -rw-r--r-- | assets/js/messaging.js | 2 | ||||
| -rw-r--r-- | assets/pages-src/gradings.bvr | 4 | ||||
| -rwxr-xr-x | dist/js/app.js | 2 | ||||
| -rw-r--r-- | dist/js/login.js | 2 | ||||
| -rw-r--r-- | dist/js/messaging.js | 2 | ||||
| -rwxr-xr-x | dist/pages/about.html | 2 | ||||
| -rwxr-xr-x | dist/pages/gradings.html | 4 | ||||
| -rwxr-xr-x | dist/sw.js | 4 |
9 files changed, 13 insertions, 12 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/assets/js/messaging.js b/assets/js/messaging.js index 890da18..0f55e1a 100644 --- a/assets/js/messaging.js +++ b/assets/js/messaging.js @@ -587,7 +587,7 @@ function setupEventListeners() { function getUrlParameter(sParam) { const url_params = new URLSearchParams(window.location.search); const found_param = url_params.get(sParam); - return found_param + return found_param; } var additionalstufftoaddtomessage = ""; diff --git a/assets/pages-src/gradings.bvr b/assets/pages-src/gradings.bvr index 109296b..20a2d39 100644 --- a/assets/pages-src/gradings.bvr +++ b/assets/pages-src/gradings.bvr @@ -77,11 +77,11 @@ </div> <!-- FAB --> - <div class="fixed-action-btn" id="fab-new"> + <!-- <div class="fixed-action-btn" id="fab-new"> <a class="btn-floating btn-large fab-new-message modal-trigger" href="#beziapp-add-grading"> <i class="large material-icons">add</i> </a> - </div> + </div> --> <@?i grading-add-modal@> </body> diff --git a/dist/js/app.js b/dist/js/app.js index 6980e00..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 = "a5e93ee02ed3bb5d2996ed4de85ad1149d51ef3f"; +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/js/messaging.js b/dist/js/messaging.js index 762db73..1650563 100644 --- a/dist/js/messaging.js +++ b/dist/js/messaging.js @@ -135,6 +135,6 @@ input.click();});$("#full-name").on("blur",validateName);$("#refresh-icon").clic </div> `} console.log(msgcontent);console.log(encrypted_message);sendMessage(value[$("#full-name").val()],msgsubject,htmlEncode(msgcontent));$("#msg-body").val("");$("#full-name").val("");$("#msg-subject").val("");$("#msg-send").attr("disabled","disabled");additionalstufftoaddtomessage="";$("#msg-added-image").html("");$("#msg-e2ee-pass").hide();}).catch(function(err){UIAlert(`${D("unableToReadDirectory")} ${D("messageCouldNotBeSend")}`,"45245");console.log(err);});});} -function getUrlParameter(sParam){const url_params=new URLSearchParams(window.location.search);const found_param=url_params.get(sParam);return found_param} +function getUrlParameter(sParam){const url_params=new URLSearchParams(window.location.search);const found_param=url_params.get(sParam);return found_param;} var additionalstufftoaddtomessage="";document.addEventListener("DOMContentLoaded",()=>{checkLogin();const modal_elems=document.querySelectorAll('.modal');const modal_options={onOpenStart:()=>{$("#fab-new").hide()},onCloseEnd:()=>{$("#fab-new").show()},dismissible:false};M.Modal.init(modal_elems,modal_options);loadDirectory();setupEventListeners();const tabs=document.querySelectorAll(".tabs");const tab_options={onShow:(tab)=>{if($(tab).hasClass("active")){switch(tab.id){case"beziapp-received":current_tab=0;loadMessages(false,0);break;case"beziapp-sent":current_tab=1;loadMessages(false,1);break;case"beziapp-deleted":current_tab=2;loadMessages(false,2);break;}}}};M.Tabs.init(tabs,tab_options);const fab_options={hoverEnabled:false,toolbarEnabled:false} const fab_elem=document.querySelectorAll(".fixed-action-btn");M.FloatingActionButton.init(fab_elem,fab_options);var receivedmessages=null;loadMessages(true,0);M.updateTextFields();const menus=document.querySelectorAll(".side-menu");M.Sidenav.init(menus,{edge:"right",draggable:true});});
\ No newline at end of file diff --git a/dist/pages/about.html b/dist/pages/about.html index ef33a69..4887e48 100755 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -142,7 +142,7 @@ <div class="row"> <p> <small> - ^HEAD a5e93ee02ed3bb5d2996ed4de85ad1149d51ef3f + ^HEAD a55ce514441b2dee1e0e8d2fdbcc1447fa56ad12 </small> </p> </div> diff --git a/dist/pages/gradings.html b/dist/pages/gradings.html index 306fdf0..ce30046 100755 --- a/dist/pages/gradings.html +++ b/dist/pages/gradings.html @@ -97,11 +97,11 @@ </div> <!-- FAB --> - <div class="fixed-action-btn" id="fab-new"> + <!-- <div class="fixed-action-btn" id="fab-new"> <a class="btn-floating btn-large fab-new-message modal-trigger" href="#beziapp-add-grading"> <i class="large material-icons">add</i> </a> - </div> + </div> --> <!-- Modal Structure --> <div id="beziapp-add-grading" class="modal modal-fixed-footer"> @@ -3,8 +3,8 @@ // Change version to cause cache refresh -const static_cache_name = "site-static-1.0.14.1-beta-a5e93ee"; -// commit before the latest is a5e93ee02ed3bb5d2996ed4de85ad1149d51ef3f +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! |