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:
James 2012-08-15 16:23:15 -04:00
commit 4783bf121a
28 changed files with 311 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
View file

@ -40,6 +40,10 @@ var AIRTIME = (function(AIRTIME){
$nRow.attr("id", aData["tr_id"])
.data("aData", aData)
.data("screen", "playlist");
if (aData["bl_type"] !== undefined) {
$nRow.attr("bl_type", aData["bl_type"]);
}
};
mod.fnDrawCallback = function() {

3
airtime_mvc/public/js/airtime/library/library.js
View file

@ -426,6 +426,9 @@ var AIRTIME = (function(AIRTIME) {
open_audio_preview(aData.ftype, aData.audioFile, aData.track_title, aData.artist_name);
} else if (aData.ftype == 'stream') {
open_audio_preview(aData.ftype, aData.audioFile, aData.track_title, aData.artist_name);
} else if (aData.ftype == 'block' && aData.bl_type == 'static') {
blockIndex = $(this).parent().attr('id').substring(3); //remove the bl_
open_block_preview(blockIndex, 0);
}
return false;
});

3
airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
View file

@ -414,7 +414,8 @@ function sizeTextBoxes(ele, classToRemove, classToAdd) {
function populateModifierSelect(e) {
var criteria_type = getCriteriaOptionType(e),
index = getRowIndex($(e).parent()),
divs = $(e).parents().find('select[id^="sp_criteria_modifier_'+index+'"]');
critIndex = index.substring(0, 1),
divs = $(e).parents().find('select[id^="sp_criteria_modifier_'+critIndex+'"]');
$.each(divs, function(i, div){
$(div).children().remove();