From 2569ce4d0a638046a050475846a295d3632ab5b0 Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Wed, 9 Sep 2015 13:54:16 -0400
Subject: [PATCH] CC-6136: Playlist fade values don't get or set properly

Fix smartblock design and fade out saving bug
---
 .../application/views/scripts/playlist/smart-block.phtml | 9 +++++----
 airtime_mvc/public/js/airtime/library/spl.js             | 7 +++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
index 8fe4da304..0709ac90d 100644
--- a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml
@@ -65,11 +65,12 @@ if (isset($this->obj)) {
     <div id="crossfade_main" class="crossfade-main clearfix" style="display:none;">
         <span class="ui-icon ui-icon-closethick"></span>
         <dl id="spl_editor-main" class="inline-list">
-            <dt><?php echo _("Fade in: "); ?><span class='spl_cue_hint'><?php echo _("(ss.t)")?></span></dt>
-            <dd><span contenteditable="true" class="spl_text_input spl_main_fade_in">00</span></dd>
+            <dt><?php echo _("Fade in: "); ?></dt>
+            <dd>
+                <input class="spl_main_fade_in playlist_main_fade_input" value="0" /><span class='spl_cue_hint'> seconds</span></dd>
             <dd class="edit-error"></dd>
-            <dt><?php echo _("Fade out: "); ?><span class='spl_cue_hint'><?php echo _("(ss.t)")?></span></dt>
-            <dd><span contenteditable="true" class="spl_text_input spl_main_fade_out">00</span></dd>
+            <dt><?php echo _("Fade out: "); ?></dt>
+            <dd><input class="spl_main_fade_out playlist_main_fade_input" value="0" /><span class='spl_cue_hint'> seconds</span></dd></dd>
             <dd class="edit-error"></dd>
         </dl>
     </div>
diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js
index 89d6db9bd..57bce927c 100644
--- a/airtime_mvc/public/js/airtime/library/spl.js
+++ b/airtime_mvc/public/js/airtime/library/spl.js
@@ -778,13 +778,11 @@ var AIRTIME = (function(AIRTIME){
                         }
                         else {
                             var fadeIn = $pl.find("input.spl_main_fade_in");
-                            var fadeOut = $pl.find("span.spl_main_fade_out");
+                            var fadeOut = $pl.find("input.spl_main_fade_out");
                             if (json.fadeIn == null) {
                                 fadeIn.parent().prev().hide();
                                 fadeIn.hide();
                             } else {
-                                console.log(json.fadeIn);
-                                //console.log(fadeIn.val());
                                 fadeIn.parent().prev().show();
                                 fadeIn.show();
                                 fadeIn.val(json.fadeIn);
@@ -796,7 +794,8 @@ var AIRTIME = (function(AIRTIME){
                             } else {
                                 fadeOut.parent().prev().show();
                                 fadeOut.show();
-                                fadeOut.empty().append(json.fadeOut);
+                                fadeOut.val(json.fadeOut);
+                                fadeOut.text(json.fadeOut);
                             }
                             if (json.fadeIn != null || json.fadeOut != null) {
                                 $pl.find("#crossfade_main").show();