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 playlist bug, and sizing of jazzplayer

Browse Source
This commit is contained in:
KasperRT
2015-03-25 12:42:14 +01:00
parent 802a623b8a
commit 53b7b45e36
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
js/list.js
View File

@@ -55,11 +55,15 @@ function updateList()
"</div>"; "</div>";
$("#wrapper").append(finalhtml); $("#wrapper").append(finalhtml);
}); });
if($("#playlist").height() != $("#player").height()) if($("#playlist").height() != $("#player").height() || ($("#chan").html().toLowerCase() == "jazz" && $("#playlist").height() != $("#jplayer").height()))
{ {
if(!window.mobilecheck()) if(!window.mobilecheck())
{ {
$("#playlist").css({height: $("#player").height()-$("#adminPanel").outerHeight(true)-$("#findform").outerHeight(true)+30}); if($("#chan").html().toLowerCase() == "jazz")
{
player_name = "#jplayer";
}else player_name = "#player";
$("#playlist").css({height: $(player_name).height()-$("#adminPanel").outerHeight(true)-$("#findform").outerHeight(true)+30});
$("#playlist").css({overflow: "hidden"}); $("#playlist").css({overflow: "hidden"});
if(scroller === false) if(scroller === false)
{ {

2
static/style.css
View File

@@ -504,7 +504,7 @@ input[type="radio"] {
filter:brightness(100%) !important; filter:brightness(100%) !important;
} }
.jp { #jplayer {
display:none; display:none;
-webkit-transition: opacity 1s; -webkit-transition: opacity 1s;
transition: opacity 1s; transition: opacity 1s;