KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

merged?

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-05-09 01:20:15 +02:00
parent 2165116d77 a12b0f7e2b
commit 7fa2be34b9
5 changed files with 92 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
index.php
View File

@@ -34,6 +34,51 @@
</ul> </ul>
<ul class="right control-list"> <ul class="right control-list">
<li id="search_loader" class="valign-wrapper hide">
<div class="valign">
<div class="preloader-wrapper small active">
<div class="spinner-layer spinner-blue">
<div class="circle-clipper left">
<div class="circle"></div>
</div><div class="gap-patch">
<div class="circle"></div>
</div><div class="circle-clipper right">
<div class="circle"></div>
</div>
</div>
<div class="spinner-layer spinner-red">
<div class="circle-clipper left">
<div class="circle"></div>
</div><div class="gap-patch">
<div class="circle"></div>
</div><div class="circle-clipper right">
<div class="circle"></div>
</div>
</div>
<div class="spinner-layer spinner-yellow">
<div class="circle-clipper left">
<div class="circle"></div>
</div><div class="gap-patch">
<div class="circle"></div>
</div><div class="circle-clipper right">
<div class="circle"></div>
</div>
</div>
<div class="spinner-layer spinner-green">
<div class="circle-clipper left">
<div class="circle"></div>
</div><div class="gap-patch">
<div class="circle"></div>
</div><div class="circle-clipper right">
<div class="circle"></div>
</div>
</div>
</div>
</div>
</li>
<li> <li>
<a class="nav-btn" href="#find" id="search-btn" onclick="showSearch();"> <a class="nav-btn" href="#find" id="search-btn" onclick="showSearch();">
<i class="mdi-action-search"></i> <i class="mdi-action-search"></i>
@@ -69,6 +114,7 @@
<?php include("php/panel.php");?> <?php include("php/panel.php");?>
</ul> </ul>
<div id="results" class="search_results hide"> <div id="results" class="search_results hide">
<div id="temp-results-container">
<div id="temp-results"> <div id="temp-results">
<div id="result" class="result"> <div id="result" class="result">
<img class="thumb"> <img class="thumb">
@@ -83,6 +129,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</nav> </nav>
</div> </div>
</header> </header>

3
server/server.js
View File

@@ -637,8 +637,6 @@ function sort_list(coll, socket, send, list_send)
function send_play(coll, socket) function send_play(coll, socket)
{ {
db.collection(coll).find({now_playing:true}, function(err, np){ db.collection(coll).find({now_playing:true}, function(err, np){
if(np.length != 0)
{
db.collection(coll).find({views:{$exists:true}}, function(err, conf){ db.collection(coll).find({views:{$exists:true}}, function(err, conf){
if(conf.length != 0) if(conf.length != 0)
{ {
@@ -649,7 +647,6 @@ function send_play(coll, socket)
socket.emit(coll+",np", toSend); socket.emit(coll+",np", toSend);
} }
}); });
}
}); });
} }

9
static/css/style.css
View File

@@ -202,6 +202,15 @@ hide mdi-action-visibility mdi-action-visibility-off
padding: 0px 0px 0px 11px !important; 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{ #player_overlay{
background-color:black; background-color:black;
position: absolute; position: absolute;

28
static/js/search.js
View File

@@ -1,7 +1,7 @@
var old_input=""; var old_input="";
var timer = 0; var timer = 0;
var api_key = "***REMOVED***"; var api_key = "***REMOVED***";
var result_html = $("#temp-results").html(); var result_html = $("#temp-results-container").html();
$( "#results" ).empty(); $( "#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)?)?/ 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-navigation-close");
$("#search-btn i").toggleClass("mdi-action-search"); $("#search-btn i").toggleClass("mdi-action-search");
$("#results").toggleClass("hide");
} }
else if ($("div.result").length > 2){ else if ($("div.result").length > 2){
@@ -135,7 +136,7 @@ function showSearch(){
$(".search_input").focus(); $(".search_input").focus();
} }
$("#song-title").toggleClass("hide"); $("#song-title").toggleClass("hide");
$("#results").removeClass("hide"); $("#results").toggleClass("hide");
$("#results").empty(); $("#results").empty();
$("#search-btn i").toggleClass("mdi-navigation-close"); $("#search-btn i").toggleClass("mdi-navigation-close");
$("#search-btn i").toggleClass("mdi-action-search"); $("#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="; 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({ $.ajax({
type: "GET", type: "GET",
url: yt_url, url: yt_url,
@@ -175,6 +179,12 @@ function search(search_input){
url: vid_url, url: vid_url,
dataType:"jsonp", dataType:"jsonp",
success: function(response){ success: function(response){
var output = "";
var pre_result = $(result_html);
//$("#results").append(result_html);
$.each(response.items, function(i,song) $.each(response.items, function(i,song)
{ {
var duration=song.contentDetails.duration; 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") duration = duration.replace("PT","").replace("H","h ").replace("M","m ").replace("S","s")
thumb=song.snippet.thumbnails.medium.url; thumb=song.snippet.thumbnails.medium.url;
$("#results").append(result_html); //$("#results").append(result_html);
var song = $("#result"); var song = pre_result;
song.find(".search-title").text(title); song.find(".search-title").text(title);
song.find(".result_info").text(duration); song.find(".result_info").text(duration);
song.find(".thumb").attr("src", thumb); song.find(".thumb").attr("src", thumb);
song.find(".add-many").attr("onclick", "submit('"+id+"','"+enc_title+"',"+secs+");"); song.find(".add-many").attr("onclick", "submit('"+id+"','"+enc_title+"',"+secs+");");
song.attr("onclick", "submitAndClose('"+id+"','"+enc_title+"',"+secs+");"); song.attr("onclick", "submitAndClose('"+id+"','"+enc_title+"',"+secs+");");
song.attr("id",id); song.attr("id",id);
output += song.html();
} }
}); });
console.log(response.items.length);
$("<div style='display:none;' id='mock-div'>"+output+"</div>").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) { $(".add-many").click(function(e) {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();

1
static/js/searchlist.js
View File

@@ -11,6 +11,7 @@ $(document).ready(function()
}); });
find = false; find = false;
$("html").keydown(function(event) { $("html").keydown(function(event) {
return;
if ((event.keyCode == 27 && find) || (event.ctrlKey && event.keyCode === 70)) if ((event.keyCode == 27 && find) || (event.ctrlKey && event.keyCode === 70))
{ {
find = !find; find = !find;