From 6def94865615d5bccba3bae278ea54932643db9a Mon Sep 17 00:00:00 2001
From: sijanec <sijanecantonluka@gmail.com>
Date: Wed, 20 May 2020 19:33:31 +0200
Subject: should be ok to merge

---
 dist/js/app.js           | 2 +-
 dist/js/lang/bundle.js   | 2 ++
 dist/js/settings.js      | 3 +++
 dist/js/setup-storage.js | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'dist/js')

diff --git a/dist/js/app.js b/dist/js/app.js
index 57996d3..84a4c3a 100755
--- a/dist/js/app.js
+++ b/dist/js/app.js
@@ -3,7 +3,7 @@
 
 
 const app_version = "1.0.13-beta";
-const previous_commit = "bf35c28cb1089df86bdd57134f475f3abe9fb539";
+const previous_commit = "448708182490d551721767bffc34ef35375f5082";
 
 if ("serviceWorker" in navigator) {
     navigator.serviceWorker.register("/sw.js")
diff --git a/dist/js/lang/bundle.js b/dist/js/lang/bundle.js
index 7e269b0..9f0497b 100644
--- a/dist/js/lang/bundle.js
+++ b/dist/js/lang/bundle.js
@@ -296,6 +296,7 @@ var langstrings = {
 				errorReporting: "error reporting",
 				on: "on",
 				off: "off",
+				selectErrorReporting: "should error reports be submitted to the developers?",
         // gsec
         gsecErrNet: "GimSIS connection error",
         gsecErrLogin: "GimSIS login error (bad password?), try logging out",
@@ -491,6 +492,7 @@ var langstrings = {
 				errorReporting: "pošiljanje napak",
 				on: "vklopljeno",
 				off: "izklopljeno",
+				selectErrorReporting: "ali naj so napake v aplikaciji posredovane razvijalcem?",
         // gsec
         gsecErrNet: "napaka povezave na GimSIS",
         gsecErrLogin: "prijava v GimSIS ni uspela (napačno geslo?), poskusite se odjaviti",
diff --git a/dist/js/settings.js b/dist/js/settings.js
index 7ea0b47..1dd3bfc 100644
--- a/dist/js/settings.js
+++ b/dist/js/settings.js
@@ -66,6 +66,9 @@ document.addEventListener("DOMContentLoaded", async () => {
     var elems = document.querySelectorAll(".theme-select");
     M.FormSelect.init(elems, {});
     
+    var elems = document.querySelectorAll(".errorreporting-select");
+    M.FormSelect.init(elems, {});
+    
     // Setup language select dropdown
     var elems = document.querySelectorAll(".lang-select");
     M.FormSelect.init(elems, {});
diff --git a/dist/js/setup-storage.js b/dist/js/setup-storage.js
index ce66bba..7aaa089 100644
--- a/dist/js/setup-storage.js
+++ b/dist/js/setup-storage.js
@@ -19,7 +19,7 @@ async function setupStorage(force = false) {
         localforage.setItem("directory", {}), //\\ well I could remember my own code but I didn't.
         localforage.setItem("meals", {}),
         localforage.setItem("chosenLang", "en"),
-        localforage.setItem("theme", "light")
+        localforage.setItem("theme", "light"),
         localforage.setItem("errorReporting", "on")
     ];
 
-- 
cgit v1.2.3