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

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

Browse source 
Conflicts:
	airtime_mvc/public/js/airtime/library/spl.js
This commit is contained in:
drigato 2015-09-09 13:55:27 -04:00
commit bd4fc62e04
6 changed files with 28 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -406,7 +406,7 @@ var AIRTIME = (function(AIRTIME){
var empty = $pl.find(".spl_empty");
if (!show || empty.length > 0) {
$pl.find("#spl_crossfade").hide();
$pl.find("#spl_crossfade").attr("disabled", "disabled");
} else {
//get list of playlist contents
var list = contents.children();
@ -416,9 +416,9 @@ var AIRTIME = (function(AIRTIME){
var last = list.last();
if (first.find(':first-child').children().attr('blockid') !== undefined &&
last.find(':first-child').children().attr('blockid') !== undefined) {
$pl.find("#spl_crossfade").hide();
$pl.find("#spl_crossfade").attr("disabled", "disabled");
} else {
$pl.find("#spl_crossfade").show();
$pl.find("#spl_crossfade").removeAttr("disabled");
}
}
@ -1094,7 +1094,7 @@ var AIRTIME = (function(AIRTIME){
aSelected = AIRTIME.library.getSelectedData();
for (i = 0, length = aSelected.length; i < length; i++) {
console.log(aSelected[i]);
//console.log(aSelected[i]);
aItems.push(new Array(aSelected[i].id, aSelected[i].ftype));
}