diff --git a/index.php b/index.php index c68429ef..e85c0502 100755 --- a/index.php +++ b/index.php @@ -34,7 +34,7 @@
-
Empty Playlist
+ diff --git a/js/list.js b/js/list.js index 20dbffc9..a035a3d7 100755 --- a/js/list.js +++ b/js/list.js @@ -14,88 +14,86 @@ function updateList() url: "php/change.php", async: false }).responseText; - if(list != "empty"){ - list = $.parseJSON(list); - conf = list["conf"]; - if(conf.hasOwnProperty("addsongs") && conf["addsongs"] == "true") adminadd = 1; - else adminadd = 0; - if(conf.hasOwnProperty("allvideos") && conf["allvideos"] == "true") music = 1; - else music = 0; - if(conf.hasOwnProperty("longsongs") && conf["longsongs"] == "true") longS = 1; - else longS = 0; - if(conf.hasOwnProperty("vote") && conf["vote"] == "true") adminvote = 1; - else adminvote = 0; - if(conf.hasOwnProperty("adminpass") && conf["adminpass"] != "") hasadmin = 1; - else hasadmin = 0; - /*list[0].shift(); - list[3].shift(); - list[2].shift();*/ + list = $.parseJSON(list); + conf = list["conf"]; + if(conf.hasOwnProperty("addsongs") && conf["addsongs"] == "true") adminadd = 1; + else adminadd = 0; + if(conf.hasOwnProperty("allvideos") && conf["allvideos"] == "true") music = 1; + else music = 0; + if(conf.hasOwnProperty("longsongs") && conf["longsongs"] == "true") longS = 1; + else longS = 0; + if(conf.hasOwnProperty("vote") && conf["vote"] == "true") adminvote = 1; + else adminvote = 0; + if(conf.hasOwnProperty("adminpass") && conf["adminpass"] != "") hasadmin = 1; + else hasadmin = 0; + /*list[0].shift(); + list[3].shift(); + list[2].shift();*/ - setTimeout(function() + setTimeout(function() + { + + $("#wrapper").empty(); + + $.each(list["songs"], function(j, listeID){ + + var video_title=listeID["title"].replace(/\\\'/g, "'").replace(/"/g,"'").replace(/&/g,"&"); + var video_id = listeID["id"]; + var video_thumb = "http://i.ytimg.com/vi/"+video_id+"/default.jpg"; + var odd = ""; if(j%2==0)odd=" oddlist"; + var delsong = ""; if(pass_corr=="correct")delsong=""; + var finalhtml="
"+ + ""+ + "
"+video_title+"
"+ + "
"+listeID["votes"]+ + "+"+ + "-"+ + delsong+ + "
"+ + "
"; + $("#wrapper").append(finalhtml); + }); + if($("#playlist").height() != $("#player").height()) { - - $("#wrapper").empty(); - - $.each(list["songs"], function(j, listeID){ - - var video_title=listeID["title"].replace(/\\\'/g, "'").replace(/"/g,"'").replace(/&/g,"&"); - var video_id = listeID["id"]; - var video_thumb = "http://i.ytimg.com/vi/"+video_id+"/default.jpg"; - var odd = ""; if(j%2==0)odd=" oddlist"; - var delsong = ""; if(pass_corr=="correct")delsong=""; - var finalhtml="
"+ - ""+ - "
"+video_title+"
"+ - "
"+listeID["votes"]+ - "+"+ - "-"+ - delsong+ - "
"+ - "
"; - $("#wrapper").append(finalhtml); - }); - if($("#playlist").height() != $("#player").height()) + if(!window.mobilecheck()) { - if(!window.mobilecheck()) + $("#playlist").css({height: $("#player").height()-$("#adminPanel").outerHeight(true)+30}); + $("#playlist").css({overflow: "hidden"}); + if(scroller == false) { - $("#playlist").css({height: $("#player").height()-$("#adminPanel").outerHeight(true)+30}); - $("#playlist").css({overflow: "hidden"}); - if(scroller == false) - { - myScroll = new IScroll('#playlist', { - mouseWheel: true, - scrollbars: false, - scrollY: true, - interactiveScrollbars: false - }); - scroller = true; - }else - { - myScroll.refresh(); - } + myScroll = new IScroll('#playlist', { + mouseWheel: true, + scrollbars: false, + scrollY: true, + interactiveScrollbars: false + }); + scroller = true; + }else + { + myScroll.refresh(); } } - myScroll.refresh(); - if(window.mobilecheck()) - { - document.getElementById("player").style.display="none"; - ytplayer.pauseVideo(); - } - if(!adminTogg) - { - names=["vote","addsongs","longsongs","frontpage", "allvideos", "removeplay"]; - for (var i = 0; i < names.length; i++) { - document.getElementsByName(names[i])[0].checked = (conf[names[i]] === "true"); - document.getElementsByName(names[i])[1].checked = (conf[names[i]] === "false"); - }; - - if(hasadmin) - $("#setpass").text("Channel has admin") - else - $("#setpass").text("Channel has no admin") - } - }, 2500); - } + } + myScroll.refresh(); + if(window.mobilecheck()) + { + document.getElementById("player").style.display="none"; + ytplayer.pauseVideo(); + } + if(!adminTogg) + { + names=["vote","addsongs","longsongs","frontpage", "allvideos", "removeplay"]; + for (var i = 0; i < names.length; i++) { + document.getElementsByName(names[i])[0].checked = (conf[names[i]] === "true"); + document.getElementsByName(names[i])[1].checked = (conf[names[i]] === "false"); + }; + + if(hasadmin) + $("#setpass").text("Channel has admin") + else + $("#setpass").text("Channel has no admin") + } + }, 2500); } function vote(id, vote){ @@ -168,4 +166,4 @@ function ks() interactiveScrollbars: false }); scroller = true; -} +} \ No newline at end of file diff --git a/js/youtube.js b/js/youtube.js index b5fc58c9..ddbe1283 100755 --- a/js/youtube.js +++ b/js/youtube.js @@ -48,18 +48,20 @@ $(document).ready(function() url: "php/change.php", async: false }).responseText; - console.log(response); - - + //console.log(response); + response = $.parseJSON(response); + console.log(response["nowPlaying"].length); + conf = response["conf"]; + console.log(conf); try{ - response = $.parseJSON(response); - conf = response["conf"]; for(first in response["nowPlaying"]) break; + console.log(first); response = first; }catch(err){ - response = "empty"; + response = "1"; } + $.ajax({ type: 'get', url: 'php/timedifference.php', @@ -102,9 +104,21 @@ function onYouTubeIframeAPIReady() { 'onPlaybackQualityChange': logQ } }); - if(response == "empty") setOverlay(true); } +/** + +Legger sangen inn i
en, via swfobject + + +var params = { allowScriptAccess: "always"}; +var atts = { id: "myytplayer" }; +swfobject.embedSWF("http://www.youtube.com/v/"+response+"?enablejsapi=1&playerapiid=ytplayer&version=3&controls=1&iv_load_policy=3", + "ytapiplayer", "825", "462", "8", null, null, params, atts); + + +eventlistener for når playeren endres +*/ function onPlayerStateChange(newState) { console.log("new state: "+newState.data); console.log("beginning: "+beginning); @@ -303,14 +317,8 @@ function errorHandler(newState) console.log("error! deleted video"); } }).responseText; - if(response != "empty") - { - ytplayer.loadVideoById(response); - setBGimage(response); - setOverlay(false); - }else{ - setOverlay(true); - } + ytplayer.loadVideoById(response); + setBGimage(response); },2500); /* setTimeout(function(){ @@ -342,18 +350,4 @@ function setBGimage(id){ $("#bgimage").css("background-image", "url(http://img.youtube.com/vi/"+id+"/0.jpg)"); } -} - -function setOverlay(param){ - yp = $(".ytplayer"); - olay = $("#olay"); - if(param){ - if(olay.hasClass("hide")) olay.toggleClass("hide"); - olay.height(yp.height()); - olay.width(yp.width()); - document.getElementById("olay").style.top = document.getElementById("player").offsetTop + "px"; - document.getElementById("olay").style.left = document.getElementById("player").offsetLeft + "px"; - }else{ - if(!olay.hasClass("hide")) olay.toggleClass("hide"); - } -} +} \ No newline at end of file diff --git a/php/change.php b/php/change.php index ec7d5c3e..2940dfd0 100755 --- a/php/change.php +++ b/php/change.php @@ -57,11 +57,6 @@ if(is_array($data["conf"]["views"])){ //If test for either saving when the song is done, or an error has occured if(isset($_REQUEST['thisUrl'])){ - if(count($data["nowPlaying"]) == 0 && count($data["songs"]) == 0) - { - echo "empty"; - return; - } $string = $_REQUEST['thisUrl']; //saving string as the id of the song $action = isset($_REQUEST['act']); //checking the action of the request, either save or del $firstToAdd = $firstSong[0]["id"]; //getting the id of the first in the queue @@ -242,8 +237,8 @@ else if(isset($_GET['skip'])){ //skip, //$data["conf"]["addsongs"] = $addsongs; //$data["conf"]["longsongs"] = $longsongs; //$data["conf"]["frontpage"] = $frontpage; - //$data["conf"]["allvideos"] = $allvideos; - //$data["conf"]["removeplay"] = $removeplay; + //$data["conf"]["allvideos"] = $allvideos; + //$data["conf"]["removeplay"] = $removeplay; if($data["conf"]["adminpass"] == $pass || $q != 1 || $data["conf"]["adminpass"] == "") //if the password is the same as the one in the jsonfile, we are updating the settings (not in use yet) { $data["conf"]["adminpass"] = $pass; @@ -254,11 +249,6 @@ else if(isset($_GET['skip'])){ //skip, echo "wrong"; } }else{ //printing the whole data array json encoded for youtube.js or list.js to pick up - if(count($data["nowPlaying"]) == 0 && count($data["songs"]) == 0) - { - echo "empty"; - return; - } echo json_encode($data); } @@ -291,4 +281,4 @@ function nextSong(){ $data[5]=array(); $data[1][0] = time(); } -?> +?> \ No newline at end of file diff --git a/static/style.css b/static/style.css index 237deddb..b955437d 100755 --- a/static/style.css +++ b/static/style.css @@ -89,9 +89,6 @@ input[type="radio"]{display: none;} .button{background-color: rgba(255,255,255,0.2); border-radius: 4px; border: none;color: white;padding: 5px 15px; margin-top: 15px; transition: all 0.1s ease-in-out;} .button:hover{background-color: rgba(255,255,255,0.4); } -#olay{background-color:black;position:absolute;display:block;} -.hide{display:none !important;} -#olay span{position:absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);} @-webkit-keyframes fadein{from {opacity:0;}to{opacity:1;}}@keyframes fadein{from{opacity:0;}to{opacity:1;}}@-moz-keyframes fadein{from{opacity:0;}to{opacity:1;}}@-o-keyframes fadein{from{opacity:0;}to{opacity:1;}}