Fix jerky play queue animation right after loading

master
François-Xavier Thomas 8 years ago
parent d2c23dfbcf
commit ef1a41b2a6
No known key found for this signature in database
GPG Key ID: 64337406D2DD45CE
  1. 2
      libresonic-main/src/main/webapp/WEB-INF/jsp/index.jsp
  2. 4
      libresonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp

@ -11,7 +11,7 @@
<frameset id="mainFrameset" cols=${model.showSideBar ? "230,*" : "0,*"} border="0" framespacing="0" frameborder="0"> <frameset id="mainFrameset" cols=${model.showSideBar ? "230,*" : "0,*"} border="0" framespacing="0" frameborder="0">
<frame name="left" src="left.view?" marginwidth="0" marginheight="0" class="bgcolor2"> <frame name="left" src="left.view?" marginwidth="0" marginheight="0" class="bgcolor2">
<frameset id="playQueueFrameset" rows=${model.autoHidePlayQueue ? "*,50" : "75%,25%"} border="0" framespacing="0" frameborder="0"> <frameset id="playQueueFrameset" rows=${model.autoHidePlayQueue ? "*,50" : "*,150"} border="0" framespacing="0" frameborder="0">
<frameset cols="*,${model.showRight ? 235 : 0}" border="0" framespacing="0" frameborder="0"> <frameset cols="*,${model.showRight ? 235 : 0}" border="0" framespacing="0" frameborder="0">
<frame name="main" src="nowPlaying.view?" marginwidth="0" marginheight="0" class="bgcolor1"> <frame name="main" src="nowPlaying.view?" marginwidth="0" marginheight="0" class="bgcolor1">
<frame name="right" src="right.view?" class="bgcolor1"> <frame name="right" src="right.view?" class="bgcolor1">

@ -31,13 +31,13 @@
<body class="bgcolor2 playlistframe" onload="init()"> <body class="bgcolor2 playlistframe" onload="init()">
<span id="dummy-animation-target" style="max-width:50px;display: none"></span> <span id="dummy-animation-target" style="max-width: ${model.autoHide ? 50 : 150}px; display: none"></span>
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">
var songs = null; var songs = null;
var currentStreamUrl = null; var currentStreamUrl = null;
var repeatEnabled = false; var repeatEnabled = false;
var isVisible = ${model.autoHidePlayQueue ? 'false' : 'true'}; var isVisible = ${model.autoHide ? 'false' : 'true'};
var CastPlayer = new CastPlayer(); var CastPlayer = new CastPlayer();
var ignore = false; var ignore = false;

Loading…
Cancel
Save