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

CC-3765: When master resource and schedule source are all ON, the current playing area only shows scheduled resource's name

Browse source 
-fixed
This commit is contained in:
denise 2012-05-07 16:08:26 -04:00
parent 0a03bba5b7
commit b4d8c72869
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
airtime_mvc/public/js/airtime/dashboard/playlist.js
View file

@ -85,7 +85,7 @@ function updateProgressBarValue(){
var scheduled_play_div = $("#scheduled_play_div") var scheduled_play_div = $("#scheduled_play_div")
var scheduled_play_line_to_switch = scheduled_play_div.parent().find(".line-to-switch") var scheduled_play_line_to_switch = scheduled_play_div.parent().find(".line-to-switch")
if (currentSong !== null){ if (currentSong !== null && !master_dj_on_air && !live_dj_on_air){
songPercentDone = (estimatedSchedulePosixTime - currentSong.songStartPosixTime)/currentSong.songLengthMs*100; songPercentDone = (estimatedSchedulePosixTime - currentSong.songStartPosixTime)/currentSong.songLengthMs*100;
if (songPercentDone < 0 || songPercentDone > 100){ if (songPercentDone < 0 || songPercentDone > 100){
songPercentDone = 0; songPercentDone = 0;
@ -149,7 +149,7 @@ function updatePlaybar(){
$('#previous').empty(); $('#previous').empty();
$('#prev-length').empty(); $('#prev-length').empty();
} }
if (currentSong !== null){ if (currentSong !== null && !master_dj_on_air && !live_dj_on_air){
if (currentSong.record == "1") if (currentSong.record == "1")
$('#current').html("<span style='color:red; font-weight:bold'>Recording: </span>"+currentSong.name+","); $('#current').html("<span style='color:red; font-weight:bold'>Recording: </span>"+currentSong.name+",");
else else
@ -185,7 +185,7 @@ function updatePlaybar(){
$('#time-elapsed').empty(); $('#time-elapsed').empty();
$('#time-remaining').empty(); $('#time-remaining').empty();
$('#song-length').empty(); $('#song-length').empty();
if (currentSong !== null){ if (currentSong !== null && !master_dj_on_air && !live_dj_on_air){
$('#start').text(currentSong.starts.split(' ')[1]); $('#start').text(currentSong.starts.split(' ')[1]);
$('#end').text(currentSong.ends.split(' ')[1]); $('#end').text(currentSong.ends.split(' ')[1]);