From ba496369c83e5d5d442a9a3e6f942e76593f9695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Wed, 29 Apr 2015 00:25:00 +0200
Subject: [PATCH] Fixed ESC button not working on search input, and removed
 some logs

---
 static/js/search.js | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/static/js/search.js b/static/js/search.js
index 702df3f9..8478c40d 100755
--- a/static/js/search.js
+++ b/static/js/search.js
@@ -20,10 +20,22 @@ $(document).ready(function()
 		}
 	});
 
+	$("body").keyup(function(event) {
+		if(event.keyCode == 27){
+			$("#results").html("");
+			$(".main").removeClass("blurT");
+			$("#controls").removeClass("blurT");
+			$(".main").removeClass("clickthrough");
+			if(!contains($("#search-wrapper").attr("class").split(" "), "hide"))
+				$("#search-wrapper").toggleClass("hide");
+			if(contains($("#song-title").attr("class").split(" "), "hide"))
+				$("#song-title").toggleClass("hide");
+		}
+	});
+
 	$(".search_input").focus();
 	$(".search_input").keyup(function(event) {
 		search_input = $(this).val();
-		console.log(search_input);
 		if(event.keyCode == 13 && search_input == "fireplace")
 		{
 			if(!peis)
@@ -44,12 +56,6 @@ $(document).ready(function()
 			if(search_input.length < 3){$("#results").html("");}
 			if(event.keyCode == 13){
 			 	search(search_input);
-			}else if(event.keyCode == 27){
-				$("#results").html("");
-				$(".main").removeClass("blurT");
-				$("#controls").removeClass("blurT");
-				$(".main").removeClass("clickthrough");
-				showSearch();
 			}else{
 				i = 0;
 				timer=100;
@@ -153,7 +159,7 @@ function search(search_input){
 					vid_url += data.id.videoId+",";
 				});
 				console.log(vid_url)
-				
+
 				$.ajax({
 				type: "GET",
 				url: vid_url,
@@ -223,3 +229,14 @@ function durationToSeconds(duration) {
     seconds= parseInt(matches[16])||0
     return hours*60*60+minutes*60+seconds;
 }
+
+
+function contains(a, obj) {
+    var i = a.length;
+    while (i--) {
+       if (a[i] === obj) {
+           return true;
+       }
+    }
+    return false;
+}