From fdab1aca565e2477a0d443f124496063b25e17d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Tue, 23 Jun 2015 18:55:26 +0200 Subject: [PATCH] Trying out incapsulation --- index.php | 10 ++-- php/footer.php | 13 +---- php/panel.php | 6 +- server/server.js | 3 +- static/js/hostcontroller.js | 2 +- static/js/search.js | 113 ++++++++++++++++++------------------ 6 files changed, 69 insertions(+), 78 deletions(-) diff --git a/index.php b/index.php index 1bd0a88a..9f286c20 100755 --- a/index.php +++ b/index.php @@ -26,7 +26,7 @@
  • -
    +
    • diff --git a/php/footer.php b/php/footer.php index 5c5da38f..be75dcf5 100755 --- a/php/footer.php +++ b/php/footer.php @@ -66,20 +66,13 @@ - - - + + diff --git a/php/panel.php b/php/panel.php index 4a0f13b5..7e353457 100755 --- a/php/panel.php +++ b/php/panel.php @@ -4,16 +4,16 @@ Channel Settings -
    +
    -
    +
    • - +
      • diff --git a/server/server.js b/server/server.js index 0eec4c8e..a9301575 100755 --- a/server/server.js +++ b/server/server.js @@ -153,8 +153,7 @@ io.on('connection', function(socket){ if(list !== undefined && list !== null && list != "") { in_list = true; - list = list.split(','); - coll = list[0].toLowerCase(); + coll = list.toLowerCase(); socket.join(coll); socket.join(short_id); socket.emit("id", short_id); diff --git a/static/js/hostcontroller.js b/static/js/hostcontroller.js index 9c5fc1bf..c3906d23 100755 --- a/static/js/hostcontroller.js +++ b/static/js/hostcontroller.js @@ -1,5 +1,5 @@ var began = false; -var id +var id; socket.on("id", function(id) { diff --git a/static/js/search.js b/static/js/search.js index 629ac048..11724f95 100755 --- a/static/js/search.js +++ b/static/js/search.js @@ -173,72 +173,71 @@ function search(search_input){ success: function(response){ if(response.items){ //get list of IDs and make new request for video info - $.each(response.items, function(i,data) - { - vid_url += data.id.videoId+","; - }); - console.log("Search for: "+keyword) - - $.ajax({ - type: "GET", - 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) + $.each(response.items, function(i,data) { - var duration=song.contentDetails.duration; - secs=durationToSeconds(duration) - if(!longsongs || secs<720){ - title=song.snippet.title; - enc_title=encodeURIComponent(title).replace(/'/g, "\\\'"); - id=song.id; - duration = duration.replace("PT","").replace("H","h ").replace("M","m ").replace("S","s") - thumb=song.snippet.thumbnails.medium.url; + vid_url += data.id.videoId+","; + }); + console.log("Search for: "+keyword) + + $.ajax({ + type: "GET", + url: vid_url, + dataType:"jsonp", + success: function(response){ + + var output = ""; + var pre_result = $(result_html); //$("#results").append(result_html); - var songs = pre_result; - songs.find(".search-title").text(title); - songs.find(".result_info").text(duration); - songs.find(".thumb").attr("src", thumb); - songs.find(".add-many").attr("onclick", "submit('"+id+"','"+enc_title+"',"+secs+");"); - $($(songs).find("div")[0]).attr("onclick", "submitAndClose('"+id+"','"+enc_title+"',"+secs+");"); - $($(songs).find("div")[0]).attr("id", id) - output += songs.html(); + $.each(response.items, function(i,song) + { + var duration=song.contentDetails.duration; + secs=durationToSeconds(duration) + if(!longsongs || secs<720){ + title=song.snippet.title; + enc_title=encodeURIComponent(title).replace(/'/g, "\\\'"); + id=song.id; + duration = duration.replace("PT","").replace("H","h ").replace("M","m ").replace("S","s") + thumb=song.snippet.thumbnails.medium.url; + //$("#results").append(result_html); + var songs = pre_result; + + songs.find(".search-title").text(title); + songs.find(".result_info").text(duration); + songs.find(".thumb").attr("src", thumb); + songs.find(".add-many").attr("onclick", "submit('"+id+"','"+enc_title+"',"+secs+");"); + $($(songs).find("div")[0]).attr("onclick", "submitAndClose('"+id+"','"+enc_title+"',"+secs+");"); + $($(songs).find("div")[0]).attr("id", id) + output += songs.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(); + return false; + }); } }); - - 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(); - return false; - }); } - }); - } - } - }); - - }else{ - $(".main").removeClass("blurT"); - $("#controls").removeClass("blurT"); - $(".main").removeClass("clickthrough"); - } + } + }); + }else{ + $(".main").removeClass("blurT"); + $("#controls").removeClass("blurT"); + $(".main").removeClass("clickthrough"); + } } function submitAndClose(id,title,duration){