Merge branch 'master' of github.com:nixolas1/Zoff

This commit is contained in:
Nicolas A. Tonne
2015-05-06 14:31:18 +02:00
4 changed files with 18 additions and 5 deletions

View File

@@ -48,6 +48,7 @@ function populate_channels(lists)
num++;
if(num>19)break;
}
document.getElementById("preloader").style.display = "none";
document.getElementById("searches").innerHTML = output;
Materialize.showStaggeredList('#channels');
$("#search").focus();

View File

@@ -203,7 +203,7 @@ function errorHandler(newState)
var failsafe = ytplayer.getVideoUrl().split("https://www.youtube.com/watch");
if(newState.data == 5 || newState.data == 100 || newState.data == 101 || newState.data == 150)
{
socket.emit("skip");
socket.emit("skip", newState.data);
}
}