Merge branch 'master' of github.com:zoff-music/Zoff

This commit is contained in:
Nicolas Almagro Tonne
2015-11-28 19:11:09 +01:00
4 changed files with 12 additions and 3 deletions

View File

@@ -1032,6 +1032,10 @@ nav ul li:hover, nav ul li.active {
right: 0; right: 0;
} }
#player{
display:none;
}
.hide-on-small-only{ .hide-on-small-only{
display:none; display:none;
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -14,6 +14,7 @@ var Playercontrols = {
document.getElementById("volume-button").addEventListener("click", Playercontrols.mute_video); document.getElementById("volume-button").addEventListener("click", Playercontrols.mute_video);
document.getElementById("playpause").addEventListener("click", Playercontrols.play_pause); document.getElementById("playpause").addEventListener("click", Playercontrols.play_pause);
document.getElementById("fullscreen").addEventListener("click", Playercontrols.fullscreen); document.getElementById("fullscreen").addEventListener("click", Playercontrols.fullscreen);
}, },
initSlider: function() initSlider: function()
@@ -58,9 +59,13 @@ var Playercontrols = {
if(ytplayer.getPlayerState() == 1) if(ytplayer.getPlayerState() == 1)
{ {
ytplayer.pauseVideo(); ytplayer.pauseVideo();
if(window.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream)
document.getElementById("player").style.display = "none";
}else if(ytplayer.getPlayerState() == 2 || ytplayer.getPlayerState() == 0) }else if(ytplayer.getPlayerState() == 2 || ytplayer.getPlayerState() == 0)
{ {
ytplayer.playVideo(); ytplayer.playVideo();
if(window.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream)
document.getElementById("player").style.display = "block";
} }
}, },