From c312608f2d7d4e8b10e16e9860ce208867f11ee6 Mon Sep 17 00:00:00 2001
From: Krateng <git.noreply@krateng.ch>
Date: Fri, 25 Sep 2020 16:03:51 +0200
Subject: [PATCH] Cleaned some JS code

---
 maloja/server.py                    |  3 ++-
 maloja/web/jinja/admin_issues.jinja | 14 +++++++-------
 maloja/web/jinja/admin_setup.jinja  | 20 ++++++++++----------
 maloja/web/jinja/wait.jinja         |  2 +-
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/maloja/server.py b/maloja/server.py
index 01cc5e5..92101e6 100755
--- a/maloja/server.py
+++ b/maloja/server.py
@@ -91,7 +91,8 @@ css = generate_css()
 
 
 def clean_html(inp):
-	return html_minify(inp)
+	if settings.get_settings("DEV_MODE"): return inp
+	else: return html_minify(inp)
 
 #os.makedirs("web/css",exist_ok=True)
 #with open("web/css/style.css","w") as f:
diff --git a/maloja/web/jinja/admin_issues.jinja b/maloja/web/jinja/admin_issues.jinja
index b3c70f6..654263f 100644
--- a/maloja/web/jinja/admin_issues.jinja
+++ b/maloja/web/jinja/admin_issues.jinja
@@ -7,26 +7,26 @@
 {% block scripts %}
 	<script>
 		function newrule() {
-			keys = ""
+			keys = "";
 			for (var i = 1; i < arguments.length; i++) {
-				keys += encodeURIComponent(arguments[i]) + "&"
+				keys += encodeURIComponent(arguments[i]) + "&";
 			}
-			console.log(keys)
+			console.log(keys);
 
 
 			var xhttp = new XMLHttpRequest();
 			xhttp.open("POST","/api/newrule?", true);
 			xhttp.send(keys);
-			e = arguments[0]
-			line = e.parentNode
-			line.parentNode.removeChild(line)
+			e = arguments[0];
+			line = e.parentNode;
+			line.parentNode.removeChild(line);
 		}
 
 		function fullrebuild() {
 
 			var xhttp = new XMLHttpRequest();
 			xhttp.open("POST","/api/rebuild", true);
-			xhttp.send()
+			xhttp.send();
 			window.location = "/wait";
 
 		}
diff --git a/maloja/web/jinja/admin_setup.jinja b/maloja/web/jinja/admin_setup.jinja
index ce6581d..531a38e 100644
--- a/maloja/web/jinja/admin_setup.jinja
+++ b/maloja/web/jinja/admin_setup.jinja
@@ -8,10 +8,10 @@
 
 
 		function replaceurls() {
-			url = window.location.origin
-			s = document.getElementsByName("serverurl")
+			url = window.location.origin;
+			s = document.getElementsByName("serverurl");
 			for (var i=0;i<s.length;i++) {
-				s[i].innerHTML = url
+				s[i].innerHTML = url;
 			}
 		}
 
@@ -21,26 +21,26 @@
 		}
 
 		function activateRuleModule(e,filename) {
-			keys = "filename=" + encodeURIComponent(filename)
-			console.log(keys)
+			keys = "filename=" + encodeURIComponent(filename);
+			console.log(keys);
 			var xhttp = new XMLHttpRequest();
 			xhttp.open("POST","/api/importrules", true);
 			xhttp.send(keys);
 
-			e.innerHTML = e.innerHTML.replace("Add","Remove")
-			e.getAttributeNode("onclick").value = e.getAttribute("onclick").replace("activate","deactivate")
+			e.innerHTML = e.innerHTML.replace("Add","Remove");
+			e.getAttributeNode("onclick").value = e.getAttribute("onclick").replace("activate","deactivate");
 			/* Nobody ever look at this code please */
 		}
 
 		function deactivateRuleModule(e,filename) {
-			keys = "remove&filename=" + encodeURIComponent(filename)
+			keys = "remove&filename=" + encodeURIComponent(filename);
 
 			var xhttp = new XMLHttpRequest();
 			xhttp.open("POST","/api/importrules", true);
 			xhttp.send(keys);
 
-			e.innerHTML = e.innerHTML.replace("Remove","Add")
-			e.getAttributeNode("onclick").value = e.getAttribute("onclick").replace("deactivate","activate")
+			e.innerHTML = e.innerHTML.replace("Remove","Add");
+			e.getAttributeNode("onclick").value = e.getAttribute("onclick").replace("deactivate","activate");
 		}
 
 		document.addEventListener("DOMContentLoaded",replace);
diff --git a/maloja/web/jinja/wait.jinja b/maloja/web/jinja/wait.jinja
index 8bb5536..3a6db39 100644
--- a/maloja/web/jinja/wait.jinja
+++ b/maloja/web/jinja/wait.jinja
@@ -27,7 +27,7 @@
 
 	function goback() {
 		if ((this.readyState == 4) && (this.status == 205)) {
-			console.log("Not ready yet!")
+			console.log("Not ready yet!");
 			pending = false;
 		}
 		if ((this.readyState == 4) && (this.status == 204)) {