Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-6136: Playlist fade values don't get or set properly

Browse source 
Fix smartblock design and fade out saving bug
This commit is contained in:
drigato 2015-09-09 13:54:16 -04:00
parent c2d1b788c5
commit 2569ce4d0a
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
airtime_mvc/public/js/airtime/library/spl.js
View file

@ -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();