Fixed merge issues

This commit is contained in:
Nicolas A. Tonne
2014-10-10 14:23:47 +02:00
5 changed files with 110 additions and 59 deletions

9
js/youtube.js Executable file → Normal file
View File

@@ -39,9 +39,10 @@ $(document).ready(function()
url: "php/change.php",
async: false
}).responseText;
url = $.parseJSON(response);
//console.log(response);
response = $.parseJSON(response);
for(first in response["nowPlaying"]) break;
console.log(first);
$.ajax({
type: 'get',
url: 'php/timedifference.php',
@@ -53,7 +54,7 @@ $(document).ready(function()
});
console.log("timediff:"+timeDifference[0]);
response = url[0][0];
response = first;
tag = document.createElement('script');
tag.src = "https://www.youtube.com/iframe_api";