diff --git a/airtime_mvc/application/views/scripts/playlist/smart-block.phtml b/airtime_mvc/application/views/scripts/playlist/smart-block.phtml index f6cc77625..eb80e402c 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)) { diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index 19757efcd..394a1bb1a 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();