From ff4d47d64ca6da7b1a74a951b7bc5651eb22e770 Mon Sep 17 00:00:00 2001
From: bevilj <bevilj@usi.ch>
Date: Thu, 15 Nov 2018 20:54:09 +0000
Subject: [PATCH] reformat and cleanup js code

git-svn-id: svn+ssh://atelier.inf.usi.ch/home/bevilj/group-1@221 a672b425-5310-4d7a-af5c-997e18724b81
---
 site/_layouts/home.html |  93 ++++++++++++++++---------------
 site/_layouts/main.html | 120 ++++++++++++++++++++++------------------
 2 files changed, 113 insertions(+), 100 deletions(-)

diff --git a/site/_layouts/home.html b/site/_layouts/home.html
index 8bbf5e6..4db6ef4 100644
--- a/site/_layouts/home.html
+++ b/site/_layouts/home.html
@@ -38,60 +38,63 @@
     {{ content }}
     </main>
     {% include footer.html %}
-		<script src="https://cdn.rawgit.com/christian-fei/Simple-Jekyll-Search/master/dest/simple-jekyll-search.min.js"></script>
-		<script>
-		document.addEventListener('DOMContentLoaded', function() {
-			var searchBar = document.getElementById('search-bar');
-			var results = document.getElementById('search-results');
+        <script src="https://cdn.rawgit.com/christian-fei/Simple-Jekyll-Search/master/dest/simple-jekyll-search.min.js"></script>
+        <script>
+document.addEventListener('DOMContentLoaded', function() {
+    var searchBar = document.getElementById('search-bar');
+    var results = document.getElementById('search-results');
 
-			var sjs = SimpleJekyllSearch({
-				searchInput: searchBar,
-				resultsContainer: results,
-				json: '/search.json',
-				searchResultTemplate:
-					'<li><a href="{url}"><h3>{title}</h3><h4>{category}</h4></a></li>',
-				success: function(sr) {
-					results.setAttribute("class", sr.length <= 1 ? "" : "show");
-				}
-			});
+    var sjs = SimpleJekyllSearch({
+        searchInput: searchBar,
+        resultsContainer: results,
+        json: '/search.json',
+        searchResultTemplate:
+            '<li><a href="{url}"><h3>{title}</h3><h4>{category}</h4></a></li>',
+        success: function(sr) {
+            results.setAttribute("class", sr.length <= 1 ? "" : "show");
+        }
+    });
 
-			searchBar.addEventListener('keypress', function () {
-				sjs.search();
-			});
-		});
+    searchBar.addEventListener('keypress', function () {
+        sjs.search();
+    });
+});
 
-		var sentence =["<span class='NotoSansLight'>t", "h", "e</span>", "<span class='NotoSansBold'>s", "h", "e", "l", "l</span>"];
-		var shell = "";
-		var counter = 0;
+// Animated logo
+var sentence = ["<span class='NotoSansLight'>t", "h", "e</span>",
+        "<span class='NotoSansBold'>s", "h", "e", "l", "l</span>"];
+var shell = "";
+var counter = 0;
 
-		function typing_shell(){
-			if(counter < 8){
-				write(counter);
-				counter++;
-			}else{
-				document.getElementById("blikli").classList.add("bli");
-			}
+function typing_shell() {
+    if (counter < 8){
+        write(counter);
+        counter++;
+    } else {
+        document.getElementById("blikli").classList.add("bli");
+    }
+}
 
-		}
+setInterval(typing_shell, 200);
 
-		setInterval(
-			typing_shell
-		, 200);
+function write(position){
+    shell = shell + sentence[position];
+    document.getElementById("title-home").innerHTML = shell;
+}
 
-		function write(position){
-			shell = shell + sentence[position];
-			document.getElementById("title-home").innerHTML = shell;
-		}
+var isChrome = /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor);
+if (!isChrome) {
+    document.getElementById('foolChrome').remove();
+    var homeVideo = document.getElementById('videoHome');
 
-
-    var isChrome = /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor);
-    if (!isChrome) {
-        document.getElementById('foolChrome').remove();
-
-        // Mute and play
-        var homeVideo = document.getElementById('videoHome');
+    // Try and see if we can play with audio, otherwise mute the video
+    try {
+        homeVideo.play();
+    } catch (err) {
+        homeVideo.muted = true;
         homeVideo.play();
     }
+}
 
-		</script>
+        </script>
   </body>
diff --git a/site/_layouts/main.html b/site/_layouts/main.html
index d23e364..0212d34 100644
--- a/site/_layouts/main.html
+++ b/site/_layouts/main.html
@@ -9,63 +9,73 @@
     {{ content }}
     </main>
     {% include footer.html %}
-		<script src="https://cdn.rawgit.com/christian-fei/Simple-Jekyll-Search/master/dest/simple-jekyll-search.min.js"></script>
-		<script>
-		document.addEventListener('DOMContentLoaded', function() {
-			var searchBar = document.getElementById('search-bar');
-			var results = document.getElementById('search-results');
+    <script src="https://cdn.rawgit.com/christian-fei/Simple-Jekyll-Search/master/dest/simple-jekyll-search.min.js"></script>
+    <script>
+document.addEventListener('DOMContentLoaded', function() {
+    var searchBar = document.getElementById('search-bar');
+    var results = document.getElementById('search-results');
 
-			var sjs = SimpleJekyllSearch({
-				searchInput: searchBar,
-				resultsContainer: results,
-				json: '/search.json',
-				searchResultTemplate:
-					'<li><a href="{url}"><h3>{title}</h3><h4>{category}</h4></a></li>',
-				success: function(sr) {
-					results.setAttribute("class", sr.length <= 1 ? "" : "show");
-				}
-			});
+    var sjs = SimpleJekyllSearch({
+        searchInput: searchBar,
+        resultsContainer: results,
+        json: '/search.json',
+        searchResultTemplate:
+            '<li><a href="{url}"><h3>{title}</h3><h4>{category}</h4></a></li>',
+        success: function(sr) {
+            results.setAttribute("class", sr.length <= 1 ? "" : "show");
+        }
+    });
 
-			searchBar.addEventListener('keypress', function () {
-				sjs.search();
-			});
-		});
+    searchBar.addEventListener('keypress', function () {
+        sjs.search();
+    });
+});
 
-		var bdy = document.getElementById("bdy");
-		document.addEventListener("keypress", function(event){
-			if(event.key == "w" || event.key == "k"){
-				window.scrollTo (0,0);
-			}else if(event.key == "~"){
-				location.href = "{{ site.baseurl }}/";
-			}else if(event.key == "a" || event.key == "h"){
-				var previous = "{{ site.baseurl }}/{{ page.previous-page }}";
-				if(previous){
-					location.href = previous;
-				}
-			}else if(event.key == "d" || event.key == "l"){
-				var next = "{{ site.baseurl }}/{{ page.next-page }}";
-				if(next){
-					location.href = next;
-				}
-			}else if(event.key == "s" || event.key == "j"){
-				var topic;
-				switch("{{ page.category-page }}"){
-								case "basic":
-									 topic = "{{ site.baseurl }}/pages/topic/cmd/basic.html";
-								case "intermediate":
-									 topic = "{{ site.baseurl }}/pages/topic/cmd/intermediate.html";
-								case "advanced":
-									 topic = "{{ site.baseurl }}/pages/topic/cmd/advanced.html";
-								case "fs":
-									 topic = "{{ site.baseurl }}/pages/topic/fs.html";
-								case "scripts":
-									 topic = "{{ site.baseurl }}/pages/topic/scripts.html";
-							};
-				if (topic){
-					location.href = topic;
-				}
-			}
-		});
-		</script>
+document.addEventListener("keypress", function(event) {
+    switch (event.key) {
+        case "w":
+        case "k":
+            window.scrollTo (0,0);
+            break;
+        case "a":
+        case "h":
+            var previous = "{{ page.previous-page }}";
+            if (previous) {
+                location.href = "{{ site.baseurl }}/" + previous;
+            }
+            break;
+        case "d":
+        case "l":
+            var next = "{{ page.next-page }}";
+            if (next) {
+                location.href = "{{ site.baseurl }}/" + next;
+            }
+            break;
+        case "s":
+        case "j":
+            var topicPage;
+            var topic = "{{ page.category-page }}";
+            switch (topic) {
+                case "basic":
+                case "intermediate":
+                case "advanced":
+                    topicPage = "{{ site.baseurl }}/pages/topic/cmd/" + topic + ".html";
+                    break;
+                case "fs":
+                case "scripts":
+                    topicPage = "{{ site.baseurl }}/pages/topic/" + topic + ".html";
+                    break;
+            }
+
+            if (topicPage) {
+                location.href = topicPage;
+            }
+            break;
+        case "~":
+            location.href = "{{ site.baseurl }}/";
+            break;
+    }
+});
+</script>
   </body>
 </html>