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

Merge branch '2.2.x' into devel

Browse source 
Conflicts:
	airtime_mvc/application/controllers/ShowbuilderController.php
	airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
	airtime_mvc/public/js/airtime/common/common.js
This commit is contained in:
denise 2012-10-19 12:50:36 -04:00
commit 7d8079f770
38 changed files with 361 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -815,9 +815,10 @@ var AIRTIME = (function(AIRTIME) {
//playlist screen if this is the currently edited playlist.
if ((data.ftype === "playlist" || data.ftype === "block") && screen === "playlist") {
callback = function() {
aMedia = [];
aMedia.push({"id": data.id, "type": data.ftype});
if (confirm('Are you sure you want to delete the selected item?')) {
AIRTIME.playlist.fnDelete(data.id);
AIRTIME.library.fnDeleteItems(aMedia);
}
};
}