From 63784d4e6b38705d3329b0ba1b90e9adfa374e74 Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Tue, 8 Sep 2015 16:39:33 -0400
Subject: [PATCH] Fix some behaviour with playlist/smartblock fade button

---
 .../application/views/scripts/playlist/playlist.phtml     | 6 +++---
 .../application/views/scripts/playlist/smart-block.phtml  | 4 ++--
 airtime_mvc/public/js/airtime/library/spl.js              | 8 ++++----
 python_apps/airtime-celery/airtime-celery/tasks.py        | 1 +
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/playlist/playlist.phtml b/airtime_mvc/application/views/scripts/playlist/playlist.phtml
index c7b490455..b9f107aae 100644
--- a/airtime_mvc/application/views/scripts/playlist/playlist.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/playlist.phtml
@@ -43,10 +43,10 @@ if (isset($this->obj)) {
         <div class='btn-group'>
             <button class="btn" title='<?php echo _("Shuffle playlist") ?>' type="button" id="playlist_shuffle_button"><?php echo _("Shuffle") ?></button>
         </div>
-        <div class='btn-group' style="display:<?php echo $count > 0 ?"inherit;":"none;"?>">
-            <a href="#" id="spl_crossfade" class="btn crossfade-main-button">
+        <div class='btn-group'>
+            <button id="spl_crossfade" class="btn crossfade-main-button" <?php if ($count <= 0) echo "disabled=disabled"; ?>>
                 <i class='crossfade-main-icon'></i><span class="ui-button-text"><?php echo _("Playlist crossfade") ?></span>
-            </a>
+            </button>
         </div>
         <div class='btn-group'>
             <button class="btn btn-danger" title='<?php echo _("Empty playlist content") ?>' type="button" id="pl-bl-clear-content"><?php echo _("Clear") ?></button>
diff --git a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
index e4a5d6553..c24df6a63 100644
--- a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
@@ -51,8 +51,8 @@ if (isset($this->obj)) {
         <div class='btn-group'>
             <?php echo $this->form->getElement('shuffle_button');?>
         </div>
-        <div class='btn-group' style="display:<?php echo ($this->obj->isStatic() && $count > 0) ?"inherit;":"none;"?>">
-            <a href="#" id="spl_crossfade" class="btn crossfade-main-button">
+        <div class='btn-group'>
+            <a href="#" id="spl_crossfade" class="btn crossfade-main-button" <?php if (!$this->obj->isStatic() || $count <= 0) echo "disabled=disabled"; ?>>
                 <i class='crossfade-main-icon'></i><span class="ui-button-text"><?php echo _("Playlist crossfade") ?></span>
             </a>
         </div>
diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js
index 89d6db9bd..c6c97adcc 100644
--- a/airtime_mvc/public/js/airtime/library/spl.js
+++ b/airtime_mvc/public/js/airtime/library/spl.js
@@ -406,7 +406,7 @@ var AIRTIME = (function(AIRTIME){
         var empty = $pl.find(".spl_empty");
 
         if (!show || empty.length > 0) {
-            $pl.find("#spl_crossfade").hide();
+            //$pl.find("#spl_crossfade").hide();
         } else {
             //get list of playlist contents
             var list = contents.children();
@@ -416,7 +416,7 @@ var AIRTIME = (function(AIRTIME){
             var last = list.last();
             if (first.find(':first-child').children().attr('blockid') !== undefined &&
                 last.find(':first-child').children().attr('blockid') !== undefined) {
-                $pl.find("#spl_crossfade").hide();
+                //$pl.find("#spl_crossfade").hide();
             } else {
                 $pl.find("#spl_crossfade").show();
             }
@@ -783,7 +783,7 @@ var AIRTIME = (function(AIRTIME){
                                 fadeIn.parent().prev().hide();
                                 fadeIn.hide();
                             } else {
-                                console.log(json.fadeIn);
+                                //console.log(json.fadeIn);
                                 //console.log(fadeIn.val());
                                 fadeIn.parent().prev().show();
                                 fadeIn.show();
@@ -1095,7 +1095,7 @@ var AIRTIME = (function(AIRTIME){
                 aSelected = AIRTIME.library.getSelectedData();
 
                 for (i = 0, length = aSelected.length; i < length; i++) {
-                    console.log(aSelected[i]);
+                    //console.log(aSelected[i]);
                     aItems.push(new Array(aSelected[i].id, aSelected[i].ftype));
                 }
 
diff --git a/python_apps/airtime-celery/airtime-celery/tasks.py b/python_apps/airtime-celery/airtime-celery/tasks.py
index ad5fa64af..74ce00fb3 100644
--- a/python_apps/airtime-celery/airtime-celery/tasks.py
+++ b/python_apps/airtime-celery/airtime-celery/tasks.py
@@ -38,6 +38,7 @@ def soundcloud_upload(data, token, file_path):
 @celery.task(name='soundcloud-download', acks_late=True)
 def soundcloud_download(token, callback_url, track_id=None):
     """
+    This is in stasis 
 
     :param token:       OAuth2 client access token
     :param track_id:    SoundCloud track identifier