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

CC-4144: Playlist Builder: Adding smart playlist into regular playlist will reset the Fade in/out settings to default value

Browse source 
- fixed
This commit is contained in:
James 2012-08-09 11:03:57 -04:00
parent d959e4ff11
commit ae5b6e58d7
3 changed files with 35 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -379,7 +379,6 @@ var AIRTIME = (function(AIRTIME){
var isStatic = data.isStatic;
delete data.type;
if (isStatic) {
console.log(data);
$.each(data, function(index, ele){
if (ele.track_title !== undefined) {
$html += "<div>"+ele.track_title+" "+ele.creator+" "+ele.length+"</div>";
@ -452,14 +451,26 @@ var AIRTIME = (function(AIRTIME){
playlistError(json);
}
else {
$pl.find("span.spl_main_fade_in")
.empty()
.append(json.fadeIn);
$pl.find("span.spl_main_fade_out")
.empty()
.append(json.fadeOut);
var fadeIn = $pl.find("span.spl_main_fade_in");
var fadeOut = $pl.find("span.spl_main_fade_out");
console.log(json);
if (json.fadeIn == null) {
console.log("fadein is null");
fadeIn.parent().prev().hide();
fadeIn.hide();
} else {
fadeIn.parent().prev().show();
fadeIn.show();
fadeIn.empty().append(json.fadeIn);
}
if (json.fadeOut == null) {
fadeOut.parent().prev().hide();
fadeOut.hide();
} else {
fadeOut.parent().prev().show();
fadeOut.show();
fadeOut.empty().append(json.fadeOut);
}
$pl.find("#crossfade_main").show();
}
});