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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
public/dist/embed.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
public/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
public/js/listeners.js
View File

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

9
public/js/playercontrols.js
View File

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