Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-top panel js regression fix. (Error when recording show 

finished)
This commit is contained in:
martin 2011-05-17 14:55:37 -04:00
parent 1d8f323a27
commit 167a55591b
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
airtime_mvc/public/js/airtime/dashboard/playlist.js
View File

@ -62,7 +62,7 @@ function updateProgressBarValue(){
if (showPercentDone < 0 || showPercentDone > 100){ if (showPercentDone < 0 || showPercentDone > 100){
showPercentDone = 0; showPercentDone = 0;
currentShow = new Array(); currentShow = new Array();
currentSong = new Array(); currentSong = null;
} }
} }
$('#progress-show').attr("style", "width:"+showPercentDone+"%"); $('#progress-show').attr("style", "width:"+showPercentDone+"%");
@ -131,13 +131,7 @@ function updatePlaybar(){
else else
$('#current').text(currentSong.name+","); $('#current').text(currentSong.name+",");
} }
/*
else if (currentShow.length > 0){
if (currentShow[0].record == "1"){
$('#current').html("Current: <span style='color:red; font-weight:bold'>Recording</span>");
}
}
* */
if (nextSong !== null){ if (nextSong !== null){
$('#next').text(nextSong.name+","); $('#next').text(nextSong.name+",");
$('#next-length').text(convertToHHMMSSmm(nextSong.songLengthMs)); $('#next-length').text(convertToHHMMSSmm(nextSong.songLengthMs));
@ -149,8 +143,8 @@ function updatePlaybar(){
$('#time-remaining').empty(); $('#time-remaining').empty();
$('#song-length').empty(); $('#song-length').empty();
if (currentSong !== null){ if (currentSong !== null){
$('#start').text(currentSong.starts.substring(currentSong.starts.indexOf(" ")+1)); $('#start').text(currentSong.starts.split(' ')[1]);
$('#end').text(currentSong.ends.substring(currentSong.starts.indexOf(" ")+1)); $('#end').text(currentSong.ends.split(' ')[1]);
/* Get rid of the millisecond accuracy so that the second counters for both /* Get rid of the millisecond accuracy so that the second counters for both
* show and song change at the same time. */ * show and song change at the same time. */