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

cc-2230:Overbooked show still palying 

Fixed. Assigning it to Martin for a review
This commit is contained in:
James Moon 2011-04-26 13:36:21 -07:00
parent 9236f4941d
commit d9216eafe5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
airtime_mvc/public/js/playlist/playlist.js
View File

@ -74,6 +74,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();
} }
} }
$('#progress-show').attr("style", "width:"+showPercentDone+"%"); $('#progress-show').attr("style", "width:"+showPercentDone+"%");
@ -162,7 +163,6 @@ function updatePlaybar(){
$('#time-remaining').text(convertToHHMMSS(songEndRoughly - estimatedSchedulePosixTime)); $('#time-remaining').text(convertToHHMMSS(songEndRoughly - estimatedSchedulePosixTime));
$('#song-length').text(convertToHHMMSSmm(currentSong[i].songLengthMs)); $('#song-length').text(convertToHHMMSSmm(currentSong[i].songLengthMs));
} }
/* Column 1 update */ /* Column 1 update */
$('#playlist').text("Current Show:"); $('#playlist').text("Current Show:");
var recElem = $('.recording-show'); var recElem = $('.recording-show');
@ -205,14 +205,16 @@ function parseItems(obj){
$('#time-zone').text(obj.timezone); $('#time-zone').text(obj.timezone);
previousSongs = obj.previous; previousSongs = obj.previous;
currentSong = obj.current;
nextSongs = obj.next; nextSongs = obj.next;
calcAdditionalData(previousSongs); calcAdditionalData(previousSongs);
calcAdditionalData(currentSong);
calcAdditionalData(nextSongs); calcAdditionalData(nextSongs);
currentShow = obj.currentShow; currentShow = obj.currentShow;
if(currentShow.length > 0){
currentSong = obj.current;
calcAdditionalData(currentSong);
}
nextShow = obj.nextShow; nextShow = obj.nextShow;
calcAdditionalShowData(obj.currentShow); calcAdditionalShowData(obj.currentShow);