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

@@ -40,7 +40,7 @@
     {% 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() {
+document.addEventListener('DOMContentLoaded', function() {
     var searchBar = document.getElementById('search-bar');
     var results = document.getElementById('search-results');
 
@@ -58,40 +58,43 @@
     searchBar.addEventListener('keypress', function () {
         sjs.search();
     });
-		});
+});
 
-		var sentence =["<span class='NotoSansLight'>t", "h", "e</span>", "<span class='NotoSansBold'>s", "h", "e", "l", "l</span>"];
+// Animated logo
-		var shell = "";
+var sentence = ["<span class='NotoSansLight'>t", "h", "e</span>",
-		var counter = 0;
+        "<span class='NotoSansBold'>s", "h", "e", "l", "l</span>"];
+var shell = "";
+var counter = 0;
 
-		function typing_shell(){
+function typing_shell() {
-			if(counter < 8){
+    if (counter < 8){
         write(counter);
         counter++;
-			}else{
+    } else {
         document.getElementById("blikli").classList.add("bli");
     }
+}
 
-		}
+setInterval(typing_shell, 200);
 
-		setInterval(
+function write(position){
-			typing_shell
-		, 200);
-
-		function write(position){
     shell = shell + sentence[position];
     document.getElementById("title-home").innerHTML = shell;
-		}
+}
 
-
+var isChrome = /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor);
-    var isChrome = /Chrome/.test(navigator.userAgent) && /Google Inc/.test(navigator.vendor);
+if (!isChrome) {
-    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>
   </body>

site/_layouts/main.html

@@ -11,7 +11,7 @@
     {% 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() {
+document.addEventListener('DOMContentLoaded', function() {
     var searchBar = document.getElementById('search-bar');
     var results = document.getElementById('search-results');
 
@@ -29,43 +29,53 @@
     searchBar.addEventListener('keypress', function () {
         sjs.search();
     });
-		});
+});
 
-		var bdy = document.getElementById("bdy");
+document.addEventListener("keypress", function(event) {
-		document.addEventListener("keypress", function(event){
+    switch (event.key) {
-			if(event.key == "w" || event.key == "k"){
+        case "w":
+        case "k":
             window.scrollTo (0,0);
-			}else if(event.key == "~"){
+            break;
-				location.href = "{{ site.baseurl }}/";
+        case "a":
-			}else if(event.key == "a" || event.key == "h"){
+        case "h":
-				var previous = "{{ site.baseurl }}/{{ page.previous-page }}";
+            var previous = "{{ page.previous-page }}";
-				if(previous){
+            if (previous) {
-					location.href = previous;
+                location.href = "{{ site.baseurl }}/" + previous;
             }
-			}else if(event.key == "d" || event.key == "l"){
+            break;
-				var next = "{{ site.baseurl }}/{{ page.next-page }}";
+        case "d":
-				if(next){
+        case "l":
-					location.href = next;
+            var next = "{{ page.next-page }}";
+            if (next) {
+                location.href = "{{ site.baseurl }}/" + next;
             }
-			}else if(event.key == "s" || event.key == "j"){
+            break;
-				var topic;
+        case "s":
-				switch("{{ page.category-page }}"){
+        case "j":
+            var topicPage;
+            var topic = "{{ page.category-page }}";
+            switch (topic) {
                 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";
+                    topicPage = "{{ site.baseurl }}/pages/topic/cmd/" + topic + ".html";
+                    break;
                 case "fs":
-									 topic = "{{ site.baseurl }}/pages/topic/fs.html";
                 case "scripts":
-									 topic = "{{ site.baseurl }}/pages/topic/scripts.html";
+                    topicPage = "{{ site.baseurl }}/pages/topic/" + topic + ".html";
-							};
+                    break;
-				if (topic){
-					location.href = topic;
             }
+
+            if (topicPage) {
+                location.href = topicPage;
             }
-		});
+            break;
-		</script>
+        case "~":
+            location.href = "{{ site.baseurl }}/";
+            break;
+    }
+});
+</script>
   </body>
 </html>