From 5dcffe47d6d49af6455dcf5f4aafd4b06cfd8b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Thu, 30 Apr 2015 15:41:49 +0200
Subject: [PATCH] Added ESC listener to already existing document keyup

---
 static/js/search.js | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/static/js/search.js b/static/js/search.js
index 5bdf801f..1cb2161a 100755
--- a/static/js/search.js
+++ b/static/js/search.js
@@ -21,19 +21,6 @@ $(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();
@@ -99,7 +86,16 @@ $(document).ready(function()
 });
 
 $(document).keyup(function(e) {
-	if ($("div.result").length > 2){
+	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");
+	}else	if ($("div.result").length > 2){
 	    if (e.keyCode == 40) {
 	    	if(i < $("div.result").length -2)
 	    		i++;
@@ -166,7 +162,7 @@ function search(search_input){
 					vid_url += data.id.videoId+",";
 				});
 				console.log("Search for: "+keyword)
-				
+
 				$.ajax({
 				type: "GET",
 				url: vid_url,
@@ -242,7 +238,7 @@ function addVideos(ids){
 				submit(song.id, enc_title, duration);
 			}
 		});
-		
+
 	}
 	});
 }