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

CC-84: Smart Playlists

Browse source 
- merging code
This commit is contained in:
James 2012-07-26 16:16:07 -04:00
parent 8755500d30
commit 7cde4ba2ba
5 changed files with 54 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,13 +27,14 @@ var AIRTIME = (function(AIRTIME){
mod.fnRowCallback = function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
var $nRow = $(nRow);
if (aData.ftype === "audioclip") {
$nRow.addClass("lib-audio");
} else if (aData.ftype === "stream"){
$nRow.addClass("lib-stream");
} else {
$nRow.addClass("lib-pl");
} else if (aData.ftype === "block") {
$nRow.addClass("lib-block");
} else {
$nRow.addClass("lib-pl");
}
$nRow.attr("id", aData["tr_id"])
@ -46,7 +47,7 @@ var AIRTIME = (function(AIRTIME){
mod.redrawChosen();
mod.checkToolBarIcons();
$('#library_display tr.lib-audio, tr.lib-stream, tr.lib-pl').draggable({
$('#library_display tr.lib-audio, tr.lib-stream, tr.lib-pl, tr.lib-block').draggable({
helper: function(){
var $el = $(this),
@ -89,14 +90,12 @@ var AIRTIME = (function(AIRTIME){
});
};
mod.dblClickAdd = function(id, type) {
mod.dblClickAdd = function(data, type) {
var i,
aMediaIds = [];
//process selected files/playlists.
if (type === "audioclip") {
aMediaIds.push(id);
}
aMediaIds.push(new Array(data.id, data.ftype));
AIRTIME.playlist.fnAddItems(aMediaIds, undefined, 'after');
};
@ -128,7 +127,7 @@ var AIRTIME = (function(AIRTIME){
//process selected files/playlists.
for (i = 0, length = aData.length; i < length; i++) {
temp = aData[i];
if (temp.ftype === "audioclip") {
if (temp.ftype === "audioclip" || temp.ftype === "block") {
aMediaIds.push(temp.id);
}
}

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

@ -440,7 +440,7 @@ var AIRTIME = (function(AIRTIME) {
$tr = $(el).parent();
data = $tr.data("aData");
AIRTIME.library.dblClickAdd(data.id, data.ftype);
AIRTIME.library.dblClickAdd(data, data.ftype);
}
else
{

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

@ -575,8 +575,7 @@ var AIRTIME = (function(AIRTIME){
aSelected = AIRTIME.library.getSelectedData();
for (i = 0, length = aSelected.length; i < length; i++) {
var type = aSelected[i].ftype;
aItems.push(new Array(aSelected[i].id, type));
aItems.push(new Array(aSelected[i].id, aSelected[i].ftype));
}
aReceiveItems = aItems;
@ -778,7 +777,6 @@ var AIRTIME = (function(AIRTIME){
mod.fnAddItems = function(aItems, iAfter, sAddType) {
var sUrl = "/playlist/add-items";
oData = {"aItems": aItems, "afterItem": iAfter, "type": sAddType};
playlistRequest(sUrl, oData);
};