KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-12-08 20:48:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:nixolas1/Zoff into dev

Browse Source 
Conflicts:
	static/js/search.js
This commit is contained in:
Nicolas A. Tonne
2015-04-29 00:27:29 +02:00
parent 1b00999158 ba496369c8
commit 85d01de33c
4 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
static/js/search.js
View File

@@ -21,10 +21,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)
@@ -45,12 +57,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;
@@ -250,3 +256,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;
}