diff --git a/index.php b/index.php index 0c2aedb7..bdbbeb45 100755 --- a/index.php +++ b/index.php @@ -34,6 +34,51 @@
-
- +
+
+
+ + +
+ + + + + +
+
diff --git a/server/server.js b/server/server.js index 8bfd05e6..830824dd 100755 --- a/server/server.js +++ b/server/server.js @@ -637,8 +637,6 @@ function sort_list(coll, socket, send, list_send) function send_play(coll, socket) { db.collection(coll).find({now_playing:true}, function(err, np){ - if(np.length != 0) - { db.collection(coll).find({views:{$exists:true}}, function(err, conf){ if(conf.length != 0) { @@ -649,7 +647,6 @@ function send_play(coll, socket) socket.emit(coll+",np", toSend); } }); - } }); } diff --git a/static/css/style.css b/static/css/style.css index 0f47d8d0..90c5c575 100755 --- a/static/css/style.css +++ b/static/css/style.css @@ -202,6 +202,15 @@ hide mdi-action-visibility mdi-action-visibility-off padding: 0px 0px 0px 11px !important; } +#search_loader { + height:64px; + padding: 0 15px; +} + +#search_loader:hover { + background-color:rgba(0,0,0,0); +} + #player_overlay{ background-color:black; position: absolute; diff --git a/static/js/search.js b/static/js/search.js index e4789492..7f04b92f 100755 --- a/static/js/search.js +++ b/static/js/search.js @@ -1,7 +1,7 @@ var old_input=""; var timer = 0; var api_key = "***REMOVED***"; -var result_html = $("#temp-results").html(); +var result_html = $("#temp-results-container").html(); $( "#results" ).empty(); var time_regex = /P((([0-9]*\.?[0-9]*)Y)?(([0-9]*\.?[0-9]*)M)?(([0-9]*\.?[0-9]*)W)?(([0-9]*\.?[0-9]*)D)?)?(T(([0-9]*\.?[0-9]*)H)?(([0-9]*\.?[0-9]*)M)?(([0-9]*\.?[0-9]*)S)?)?/ @@ -98,6 +98,7 @@ $(document).keyup(function(e) { $("#search-btn i").toggleClass("mdi-navigation-close"); $("#search-btn i").toggleClass("mdi-action-search"); + $("#results").toggleClass("hide"); } else if ($("div.result").length > 2){ @@ -135,7 +136,7 @@ function showSearch(){ $(".search_input").focus(); } $("#song-title").toggleClass("hide"); - $("#results").removeClass("hide"); + $("#results").toggleClass("hide"); $("#results").empty(); $("#search-btn i").toggleClass("mdi-navigation-close"); $("#search-btn i").toggleClass("mdi-action-search"); @@ -157,6 +158,9 @@ function search(search_input){ var vid_url = "https://www.googleapis.com/youtube/v3/videos?part=contentDetails,snippet,id&key="+api_key+"&id="; + if(contains($("#search_loader").attr("class").split(" "), "hide")) + $("#search_loader").removeClass("hide"); + $.ajax({ type: "GET", url: yt_url, @@ -175,6 +179,12 @@ function search(search_input){ url: vid_url, dataType:"jsonp", success: function(response){ + + var output = ""; + var pre_result = $(result_html); + + //$("#results").append(result_html); + $.each(response.items, function(i,song) { var duration=song.contentDetails.duration; @@ -186,17 +196,27 @@ function search(search_input){ duration = duration.replace("PT","").replace("H","h ").replace("M","m ").replace("S","s") thumb=song.snippet.thumbnails.medium.url; - $("#results").append(result_html); - var song = $("#result"); + //$("#results").append(result_html); + var song = pre_result; song.find(".search-title").text(title); song.find(".result_info").text(duration); song.find(".thumb").attr("src", thumb); song.find(".add-many").attr("onclick", "submit('"+id+"','"+enc_title+"',"+secs+");"); song.attr("onclick", "submitAndClose('"+id+"','"+enc_title+"',"+secs+");"); song.attr("id",id); + + output += song.html(); + } }); + console.log(response.items.length); + + $("").appendTo($("#results")).show("blind", (response.items.length-1) * 83.33); + + if(!contains($("#search_loader").attr("class").split(" "), "hide")) + $("#search_loader").addClass("hide"); + $(".add-many").click(function(e) { e.preventDefault(); e.stopPropagation(); diff --git a/static/js/searchlist.js b/static/js/searchlist.js index 02882e4b..4b29fc4b 100755 --- a/static/js/searchlist.js +++ b/static/js/searchlist.js @@ -11,6 +11,7 @@ $(document).ready(function() }); find = false; $("html").keydown(function(event) { + return; if ((event.keyCode == 27 && find) || (event.ctrlKey && event.keyCode === 70)) { find = !find;