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

merge

Browse Source
This commit is contained in:
Nicolas A. Tonne
2015-04-13 17:06:24 +02:00
parent bb5dcab642 cf5802468e
commit da13b7efb9
4 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
static/js/youtube.js
View File

@@ -52,13 +52,18 @@ socket.on(chan.toLowerCase()+",np", function(obj)
seekTo = time - conf["startTime"];
song_title = obj[0][0]["title"];
getTitle(song_title, viewers);
if(player_ready)
if(player_ready && !window.mobilecheck())
{
if(ytplayer.getVideoUrl().split('v=')[1] != video_id){
if(ytplayer.getVideoUrl().split('v=')[1] != video_id)
{
ytplayer.loadVideoById(video_id);
setBGimage(video_id);
notifyUser(video_id, song_title);
if(paused)
ytplayer.pauseVideo();
}
ytplayer.playVideo();
if(!paused)
ytplayer.playVideo();
ytplayer.seekTo(seekTo);
}
});
@@ -142,14 +147,15 @@ function onPlayerStateChange(newState) {
case 0:
socket.emit("end", video_id);
playing = false;
paused = false;
break;
case 1:
playing = true;
if(document.getElementById("playpause").className == "play")
/*if(document.getElementById("playpause").className == "play")
{
$("#playpause").toggleClass("play");
$("#playpause").toggleClass("pause");
}
}*/
if(paused)
{
socket.emit('pos');
@@ -158,11 +164,11 @@ function onPlayerStateChange(newState) {
break;
case 2:
paused = true;
if(document.getElementById("playpause").className == "pause")
/*if(document.getElementById("playpause").className == "pause")
{
$("#playpause").toggleClass("play");
$("#playpause").toggleClass("pause");
}
}*/
break;
case 3:
break;