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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
Martin Konecny 2012-07-30 21:48:25 -04:00
commit ab85ab59d9
11 changed files with 223 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -352,6 +352,40 @@ var AIRTIME = (function(AIRTIME){
//add the play function to the play icon
$pl.delegate(".big_play",
{"click": openAudioPreview});
$pl.delegate(".spl_block_expand",
{"click": function(ev){
var id = parseInt($(this).attr("id").split("_").pop(), 10);
if ($(this).hasClass('close')) {
var sUrl = "/playlist/get-block-info";
mod.disableUI();
$.post(sUrl, {format:"json", id:id}, function(json){
$html = "";
var data = $.parseJSON(json);
var isStatic = data.isStatic;
delete data.type;
if (isStatic) {
$.each(data, function(index, ele){
$html += "<div>"+ele.track_title+" "+ele.creator+" "+ele.length+"</div>";
})
} else {
for (var key in data.crit){
$.each(data.crit[key], function(index, ele){
var extra = (ele['extra']==null)?"":ele['extra'];
$html += "<div>"+ele['display_name']+" "+ele['modifier']+" "+ele['value']+" "+extra+"</div>";
});
}
$html += "<div>"+data.limit.value+" "+data.limit.modifier;
}
$pl.find("#block_"+id+"_info").html($html);
mod.enableUI();
});
$(this).removeClass('close');
} else {
$pl.find("#block_"+id+"_info").html("");
$(this).addClass('close');
}
}});
}
//sets events dynamically for the cue editor.
@ -384,7 +418,7 @@ var AIRTIME = (function(AIRTIME){
//main playlist fades events
$pl.on("click", "#spl_crossfade", function() {
var lastMod = getModified(),
type = $('#obj_type');
type = $('#obj_type').val();
if ($(this).hasClass("ui-state-active")) {
$(this).removeClass("ui-state-active");
@ -394,8 +428,7 @@ var AIRTIME = (function(AIRTIME){
$(this).addClass("ui-state-active");
var url = '/Playlist/get-playlist-fades';
$.get(url,
$.post(url,
{format: "json", modified: lastMod, type: type},
function(json){
if (json.error !== undefined){