Fixed issue with song dissapearing on voting, and added player to iphone

This commit is contained in:
Kasper Rynning-Tønnesen
2017-01-22 17:25:06 +01:00
parent 5ecb4f36bc
commit 0c1353b660
4 changed files with 18 additions and 13 deletions

View File

@@ -213,13 +213,15 @@ function init(){
if(no_socket) socket.emit('list', chan.toLowerCase());
if(/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
//if(/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
/*if(!Helper.mobilecheck() && !window.MSStream){
console.log("asd");
document.getElementById("search").blur();
$("#channel-load").css("display", "none");
} else {
} else {*/
window.onYouTubeIframeAPIReady = Player.onYouTubeIframeAPIReady;
if(Player.player === "" || Player.player === undefined || Helper.mobilecheck()) Player.loadPlayer();
}
//}
if(Helper.mobilecheck()) Mobile_remote.initiate_volume();
@@ -948,7 +950,7 @@ $(document).on("click", "#closeSettings", function(e)
});
$(window).resize(function(){
if(chan){
if(chan && !Helper.mobilecheck()){
var temp_fit = Math.round(($("#wrapper").height()) / 71)+1;
if(temp_fit > List.can_fit || temp_fit < List.can_fit){
List.dynamicContentPage(-10);

View File

@@ -4,7 +4,8 @@ var Playercontrols = {
initYoutubeControls: function()
{
if(Helper.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
//if(Helper.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
if(Helper.mobilecheck() && !window.MSStream){
$("#controls").appendTo("#playbar");
}
Playercontrols.initControls();
@@ -57,14 +58,16 @@ var Playercontrols = {
if(Player.player.getPlayerState() == 1)
{
Player.pauseVideo();
if(Helper.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
if(Helper.mobilecheck() && !window.MSStream){
//if(Helper.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
document.getElementById("player").style.display = "none";
$(".video-container").toggleClass("click-through");
$(".page-footer").toggleClass("padding-bottom-extra");
}
} else if(Player.player.getPlayerState() == 2 || Player.player.getPlayerState() === 0 || (Player.player.getPlayerState() === 5 && Helper.mobilecheck())){
Player.playVideo();
if(Helper.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
//if(Helper.mobilecheck() && !/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream){
if(Helper.mobilecheck() && !window.MSStream){
document.getElementById("player").style.display = "block";
$(".video-container").toggleClass("click-through");
$(".page-footer").toggleClass("padding-bottom-extra");