From 53b7b45e3647bb69c876df564ad57ec36d4b9056 Mon Sep 17 00:00:00 2001 From: KasperRT Date: Wed, 25 Mar 2015 12:42:14 +0100 Subject: [PATCH] Fixed playlist bug, and sizing of jazzplayer --- js/list.js | 8 ++++++-- static/style.css | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/js/list.js b/js/list.js index 248d7b2f..cb13a4fc 100755 --- a/js/list.js +++ b/js/list.js @@ -55,11 +55,15 @@ function updateList() ""; $("#wrapper").append(finalhtml); }); - if($("#playlist").height() != $("#player").height()) + if($("#playlist").height() != $("#player").height() || ($("#chan").html().toLowerCase() == "jazz" && $("#playlist").height() != $("#jplayer").height())) { 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"}); if(scroller === false) { diff --git a/static/style.css b/static/style.css index 60d1a0ae..bf3a49fb 100755 --- a/static/style.css +++ b/static/style.css @@ -504,7 +504,7 @@ input[type="radio"] { filter:brightness(100%) !important; } -.jp { +#jplayer { display:none; -webkit-transition: opacity 1s; transition: opacity 1s;