Player not reloading on changing from channel to frontpage

This commit is contained in:
Kasper Rynning-Tønnesen
2016-05-09 15:16:33 +02:00
parent 5718f6cfb4
commit 8f1499dacd
5 changed files with 38 additions and 13 deletions

View File

@@ -80,15 +80,31 @@
}
#closePlayer{
position: absolute;
top: 10px;
right: 10px;
z-index: 1;
position: fixed;
bottom: 175px;
right: 20px;
z-index: 11;
font-size: 18px;
color: white;
text-shadow: 0px 0px 2px black;
}
.frontpage_modified_heights{
height: 0px !important;
margin-bottom:0px !important;
}
.player_bottom{
position: fixed !important;
left: auto !important;
top: auto !important;
bottom: 10px;
width: 250px !important;
height: 200px !important;
right: 10px;
z-index: 10;
}
#frontpage_player{
position: fixed;
bottom: 10px;
@@ -135,7 +151,7 @@ body {
}
.main, #main-row, .video-container, #playlist{
height: calc(100vh - 64px) !important;
height: calc(100vh - 64px);
}
footer{
@@ -944,6 +960,7 @@ ul #chat-log{
/*padding:0px 15px;*/
flex:1;
position: relative;
height: calc(100vh - 64px) !important;
/*background-color:rgba(0,0,0,0.2);*/
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -565,12 +565,19 @@ function onepage_load(){
$("meta[name=theme-color]").attr("content", "#2D2D2D");
if(!/iPad|iPhone|iPod/.test(navigator.userAgent)) Player.ytplayer.destroy();
if(!window.mobilecheck()){
$("<a id='closePlayer'>X</a>").appendTo("#frontpage_player");
/*$("<a id='closePlayer'>X</a>").appendTo("#frontpage_player");
$("#player").appendTo("#frontpage_player");
Player.onYouTubeIframeAPIReady();
Player.onYouTubeIframeAPIReady();*/
$("main").append("<a id='closePlayer'>X</a>");
$("#player_overlay").remove();
$("#controls").remove();
$("#playlist").remove();
$(".ui-resizable-handle").remove();
$("#player").addClass("player_bottom");
$("#main-row").addClass("frontpage_modified_heights");
} else {
if(!/iPad|iPhone|iPod/.test(navigator.userAgent)) Player.ytplayer.destroy();
Player.ytplayer = "";
}
@@ -582,7 +589,8 @@ function onepage_load(){
$("header").html($($(e)[61]).html());
$($(e)[63]).insertAfter("header");
$($(e)[65]).insertAfter(".mega");
$("main").html($($(e)[69]).html());
if(window.mobilecheck()) $("main").html($($(e)[69]).html());
else $("main").append($($($(e)[69]).html())[0]);
$(".page-footer").removeClass("padding-bottom-extra");
$(".page-footer").removeClass("padding-bottom-novideo");
$("#favicon").attr("href", "static/images/favicon.png");

View File

@@ -394,7 +394,7 @@ $(document).on("click", "#closePlayer", function(e){
Player.ytplayer.destroy();
Player.ytplayer = "";
document.title = "Zöff";
$("#frontpage_player").empty();
$("#closePlayer").remove();
});
$(document).on('click', '#toast-container', function(){