From b2519516f62ce30533a5640b993f0efc981e4c55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Tue, 28 Apr 2015 22:09:29 +0200 Subject: [PATCH 1/5] added parseint for duration --- server/server.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/server/server.js b/server/server.js index 3b740132..a82f0eaf 100755 --- a/server/server.js +++ b/server/server.js @@ -138,7 +138,7 @@ io.on('connection', function(socket){ }else { console.log(np[0]["title"] + " before if"); - if(startTime+np[0]["duration"]<=get_time()+2) + if(startTime+parseInt(np[0]["duration"])<=get_time()+2) { console.log(np[0]["title"] + " after if"); db.collection(coll).update({now_playing:true, id:id}, @@ -197,7 +197,7 @@ io.on('connection', function(socket){ var id = arr[0]; var title = arr[1]; var hash = hash_pass(arr[2]); - var duration = arr[3]; + var duration = parseInt(arr[3]); db.collection(coll).find({views:{$exists:true}}, function(err, docs) { if((docs[0]["addsongs"] == true && (hash == docs[0]["adminpass"] || docs[0]["adminpass"] == "")) || docs[0]["addsongs"] == false) @@ -214,7 +214,6 @@ io.on('connection', function(socket){ np = false; db.collection(coll).insert({"added":get_time(),"guids":guids,"id":id,"now_playing":np,"title":title,"votes":votes, "duration":duration}, function(err, docs){ sort_list(coll, undefined, np, true); - socket.emit("toast", "addedsong"); }); }); }else{ @@ -437,7 +436,7 @@ io.on('connection', function(socket){ lists[coll].push(guid); io.sockets.emit(coll+",viewers", lists[coll].length); } - + send_play(coll, socket); }); }); From d9b31fb997c0e73e37badea97816388fa2d63582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Wed, 29 Apr 2015 00:02:36 +0200 Subject: [PATCH 2/5] logging out videoid --- static/js/youtube.js | 1 + 1 file changed, 1 insertion(+) diff --git a/static/js/youtube.js b/static/js/youtube.js index 9806ca55..a4022547 100755 --- a/static/js/youtube.js +++ b/static/js/youtube.js @@ -224,6 +224,7 @@ function errorHandler(newState) { if(video_id !== undefined) { + console.log(video_id); console.log("errorskip"); socket.emit("skip"); } From 5a2a217bc3f0946ccc159c266140c7c4ecf242df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Wed, 29 Apr 2015 00:05:07 +0200 Subject: [PATCH 3/5] more logging --- static/js/youtube.js | 1 + 1 file changed, 1 insertion(+) diff --git a/static/js/youtube.js b/static/js/youtube.js index a4022547..e66b2b54 100755 --- a/static/js/youtube.js +++ b/static/js/youtube.js @@ -225,6 +225,7 @@ function errorHandler(newState) if(video_id !== undefined) { console.log(video_id); + console.log(ytplayer.getVideoUrl()); console.log("errorskip"); socket.emit("skip"); } From cfc16dfcafd22f064cc3981b419d5038a1621b55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Wed, 29 Apr 2015 00:09:09 +0200 Subject: [PATCH 4/5] removed log of full list --- static/js/list.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/js/list.js b/static/js/list.js index 3b8c8201..2e87a4a6 100755 --- a/static/js/list.js +++ b/static/js/list.js @@ -28,7 +28,7 @@ socket.on("skipping", function(obj) function populate_list(msg, conf_only) { - console.log(msg); + //console.log(msg); console.log(conf_only); if(!conf_only) $("#wrapper").empty(); @@ -84,7 +84,7 @@ function populate_list(msg, conf_only) { player_name = "#jplayer"; }else player_name = "#player"; - + if(scroller === false) { myScroll = new IScroll('#playlist', { From ba496369c83e5d5d442a9a3e6f942e76593f9695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Wed, 29 Apr 2015 00:25:00 +0200 Subject: [PATCH 5/5] Fixed ESC button not working on search input, and removed some logs --- static/js/search.js | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/static/js/search.js b/static/js/search.js index 702df3f9..8478c40d 100755 --- a/static/js/search.js +++ b/static/js/search.js @@ -20,10 +20,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) @@ -44,12 +56,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; @@ -153,7 +159,7 @@ function search(search_input){ vid_url += data.id.videoId+","; }); console.log(vid_url) - + $.ajax({ type: "GET", url: vid_url, @@ -223,3 +229,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; +}