From b4d8c72869882ad4acf5d2b275d242c2116c3b37 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860.(none)>
Date: Mon, 7 May 2012 16:08:26 -0400
Subject: [PATCH] CC-3765: When master resource and schedule source are all ON,
 the current playing area only shows scheduled resource's name

-fixed
---
 airtime_mvc/public/js/airtime/dashboard/playlist.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/dashboard/playlist.js b/airtime_mvc/public/js/airtime/dashboard/playlist.js
index c61254857..cbf97c640 100644
--- a/airtime_mvc/public/js/airtime/dashboard/playlist.js
+++ b/airtime_mvc/public/js/airtime/dashboard/playlist.js
@@ -85,7 +85,7 @@ function updateProgressBarValue(){
     var scheduled_play_div = $("#scheduled_play_div")
     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;
         if (songPercentDone < 0 || songPercentDone > 100){
             songPercentDone = 0;        
@@ -149,7 +149,7 @@ function updatePlaybar(){
         $('#previous').empty();
         $('#prev-length').empty();
     }
-    if (currentSong !== null){
+    if (currentSong !== null && !master_dj_on_air && !live_dj_on_air){
         if (currentSong.record == "1")
             $('#current').html("<span style='color:red; font-weight:bold'>Recording: </span>"+currentSong.name+",");
         else
@@ -185,7 +185,7 @@ function updatePlaybar(){
     $('#time-elapsed').empty();
     $('#time-remaining').empty();
     $('#song-length').empty();
-    if (currentSong !== null){
+    if (currentSong !== null && !master_dj_on_air && !live_dj_on_air){
         $('#start').text(currentSong.starts.split(' ')[1]);
         $('#end').text(currentSong.ends.split(' ')[1]);