diff options
Diffstat (limited to 'assets/js')
| -rw-r--r-- | assets/js/lang/bundle.js | 2 | ||||
| -rw-r--r-- | assets/js/messaging.js | 36 |
2 files changed, 22 insertions, 16 deletions
diff --git a/assets/js/lang/bundle.js b/assets/js/lang/bundle.js index b5844d6..6a0fd2c 100644 --- a/assets/js/lang/bundle.js +++ b/assets/js/lang/bundle.js @@ -415,7 +415,7 @@ var langstrings = { recipientNotInDirectory: "izbrane osebe ni v imeniku", chatExternalInfo: "dobili ste kratko sporočilo v standardu, ki ga GimSIS ne podpira. Pri odgovarjanju spremenite zadevo. Vsebina sporočila: ", // meals - loginError: "napaka pri prijavi", + loginError: "napaka pri prijavi", loginToLopolis: "prijava v Lopolis", loginToLopolisNote: "izgleda, da niste prijavljeni v eRestavracijo, zato se vam je prikazal prijavni obrazec. Za uporavljanje s prehrano se uporablja druga kombinacija uporabniškega imena in gesla, zato se prijavite s svojimi Lopolis prijavnimi podatki za nadaljevanje.", logInToLopolis: "prijava v Lopolis", diff --git a/assets/js/messaging.js b/assets/js/messaging.js index c548965..5426c7b 100644 --- a/assets/js/messaging.js +++ b/assets/js/messaging.js @@ -91,9 +91,13 @@ function populateAutocomplete() { minLength: 0 }); - if (window.location.hash.length > 1 && !window.location.hash.substring(1).startsWith("beziapp")) { - $("#full-name").val(decodeURIComponent(window.location.hash.substring(1))); - } + $(document).ready(function () { + if (window.location.hash.length > 1 && !window.location.hash.substring(1).startsWith("beziapp")) { + $("#full-name").val(decodeURIComponent(window.location.hash.substring(1))); + $("#beziapp-new-message").modal(); + $("#beziapp-new-message").modal("open"); + } + }); M.updateTextFields(); validateName(); @@ -347,11 +351,12 @@ function displayData(messageType) { <i class="material-icons">delete</i> </a> <a onclick=" - $('#full_name').val('${filterXSS(element["posiljatelj"])}'); - $('#msg_subject').val('Re: ${filterXSS(element["zadeva"])}'); + $('#full-name').val('${filterXSS(element["posiljatelj"])}'); + $('#msg-subject').val('Re: ${filterXSS(element["zadeva"])}'); M.updateTextFields(); - $('#navigation-main').scrollIntoView(); " + data-target="beziapp-new-message" + class="modal-trigger" > <i class="material-icons">reply</i> </a> @@ -560,6 +565,16 @@ var additionalstufftoaddtomessage = ""; document.addEventListener("DOMContentLoaded", () => { checkLogin(); + + // Setup modals + 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(); @@ -596,15 +611,6 @@ document.addEventListener("DOMContentLoaded", () => { const fab_elem = document.querySelectorAll(".fixed-action-btn"); M.FloatingActionButton.init(fab_elem, fab_options); - // Setup modals - 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); - var receivedmessages = null; loadMessages(true, 0); M.updateTextFields(); |