From 36a080ac13fac093e56ec1ea37f02833d49b9b90 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860.(none)>
Date: Fri, 17 Aug 2012 14:30:46 -0400
Subject: [PATCH] CC-4243: Playlist Builder: Remove main fade block if there
 are no fades to set

-fixed
---
 .../application/views/scripts/playlist/playlist.phtml     | 8 --------
 airtime_mvc/public/js/airtime/library/spl.js              | 1 +
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/playlist/playlist.phtml b/airtime_mvc/application/views/scripts/playlist/playlist.phtml
index 0034dc71f..70ce2faea 100644
--- a/airtime_mvc/application/views/scripts/playlist/playlist.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/playlist.phtml
@@ -2,22 +2,14 @@
 if (isset($this->obj)) {
     $contents = $this->obj->getContents();
     $count = count($contents);
-    $displayFades = true;
-    if ($count > 0) {
-        if ($contents[0]['type'] == 2 && $contents[$count-1]['type'] == 2) {
-            $displayFades = false;
-        }
-    }
 }
 ?>
 <button id="spl_new" class="ui-button ui-widget ui-state-default" role="button" aria-disabled="false">New</button>
 <?php if (isset($this->obj)) : ?>
     <button id="spl_delete" class="ui-button ui-widget ui-state-default" role="button" aria-disabled="false">Delete</button>
-    <?php if ($displayFades) :?>
     <a href="#" id="spl_crossfade" class="ui-button ui-button-icon-only ui-widget ui-state-default crossfade-main-button" style="display:<?php echo $count > 0 ?"block;":"none;"?>">
         <span class="ui-icon crossfade-main-icon"></span><span class="ui-button-text">Playlist crossfade</span>
     </a>
-    <?php endif; ?>
 <?php endif; ?>
 
 <?php if (isset($this->obj)) : ?>
diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js
index f20b03091..dedd7c2b1 100644
--- a/airtime_mvc/public/js/airtime/library/spl.js
+++ b/airtime_mvc/public/js/airtime/library/spl.js
@@ -905,6 +905,7 @@ var AIRTIME = (function(AIRTIME){
 		setPlaylistEntryEvents();
 		setCueEvents();
 		setFadeEvents();
+		setFadeIcon();
 		
 		initialEvents();
 		setUpPlaylist();