Merge branch 'dev' of github.com:nixolas1/Zoff into dev

This commit is contained in:
Nicolas A. Tonne
2015-04-30 16:48:01 +02:00
2 changed files with 15 additions and 24 deletions

View File

@@ -224,19 +224,14 @@ function getTitle(titt, v)
function errorHandler(newState)
{
var failsafe = ytplayer.getVideoUrl().split("https://www.youtube.com/watch");
if(video_id !== undefined && !failsafe[0] == "" && !failsafe[1] == "")
if(newState.data == 5 || newState.data == 100 || newState.data == 101 || newState.data == 150)
{
console.log(video_id);
console.log(ytplayer.getVideoUrl());
console.log("errorskip");
socket.emit("skip");
socket.emit("skip");
}
}
function onPlayerReady(event) {
player_ready = true;
console.log(ytplayer.getVideoUrl());
console.log(ytplayer.getVideoUrl().split("https://www.youtube.com/watch"));
player_ready = true;
if(!window.mobilecheck())
{
$("#player").css("opacity", "1");