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

Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev

Browse source
This commit is contained in:
Duncan Sommerville 2015-09-09 17:25:45 -04:00
commit 1649d9db77
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();