summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
Diffstat (limited to 'dist')
-rw-r--r--dist/js/lang/bundle.js2
-rw-r--r--dist/js/messaging.js36
-rw-r--r--dist/pages/about.html2
-rw-r--r--dist/sw.js4
4 files changed, 25 insertions, 19 deletions
diff --git a/dist/js/lang/bundle.js b/dist/js/lang/bundle.js
index b5844d6..6a0fd2c 100644
--- a/dist/js/lang/bundle.js
+++ b/dist/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/dist/js/messaging.js b/dist/js/messaging.js
index c548965..5426c7b 100644
--- a/dist/js/messaging.js
+++ b/dist/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();
diff --git a/dist/pages/about.html b/dist/pages/about.html
index e41911e..4087085 100644
--- a/dist/pages/about.html
+++ b/dist/pages/about.html
@@ -142,7 +142,7 @@
<div class="row">
<p>
<small>
- ^HEAD 17de6574b4e4871162c81da0232b9db4113e0245
+ ^HEAD 70555eff18936f28b2952ca05337124489db7dca
</small>
</p>
</div>
diff --git a/dist/sw.js b/dist/sw.js
index 7c9a581..686267d 100644
--- 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.13-beta-17de657";
-// latest commit is 17de6574b4e4871162c81da0232b9db4113e0245
+const static_cache_name = "site-static-1.0.13-beta-70555ef";
+// latest commit is 70555eff18936f28b2952ca05337124489db7dca
// Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js
// sw.js NE SME BITI CACHAN, ker vsebuje verzijo!