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-08-02 16:27:00 -04:00
commit a146fdcd37
45 changed files with 1725 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -128,11 +128,14 @@ var AIRTIME = (function(AIRTIME){
for (i = 0, length = aData.length; i < length; i++) {
temp = aData[i];
if (temp.ftype === "audioclip" || temp.ftype === "block") {
aMediaIds.push(temp.id);
aMediaIds.push(new Array (temp.id, temp.ftype));
}
}
AIRTIME.playlist.fnAddItems(aMediaIds, undefined, 'after');
if (aMediaIds.length > 0) {
AIRTIME.playlist.fnAddItems(aMediaIds, undefined, 'after');
} else {
alert('You cannot add playlists to smart playlists');
}
});
//delete from library.

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

@ -639,7 +639,7 @@ var AIRTIME = (function(AIRTIME) {
//delete through the playlist controller, will reset
//playlist screen if this is the currently edited playlist.
if (data.ftype === "playlist" && screen === "playlist") {
if ((data.ftype === "playlist" || data.ftype === "block") && screen === "playlist") {
callback = function() {
if (confirm('Are you sure you want to delete the selected item?')) {