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

Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x

This commit is contained in:
Martin Konecny 2012-06-26 17:50:39 -04:00
parent 43c4b943f2 31d643cee1
commit c3d0a0868f
2 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
airtime_mvc/public/js/airtime/library/library.js
View File

@ -252,20 +252,22 @@ var AIRTIME = (function(AIRTIME) {
}; };
mod.fnDeleteSelectedItems = function() { mod.fnDeleteSelectedItems = function() {
var aData = AIRTIME.library.getSelectedData(), if (confirm('Are you sure you want to delete the selected item(s)?')) {
item, var aData = AIRTIME.library.getSelectedData(),
temp, item,
aMedia = []; temp,
aMedia = [];
//process selected files/playlists. //process selected files/playlists.
for (item in aData) { for (item in aData) {
temp = aData[item]; temp = aData[item];
if (temp !== null && temp.hasOwnProperty('id') ) { if (temp !== null && temp.hasOwnProperty('id') ) {
aMedia.push({"id": temp.id, "type": temp.ftype}); aMedia.push({"id": temp.id, "type": temp.ftype});
} }
} }
AIRTIME.library.fnDeleteItems(aMedia); AIRTIME.library.fnDeleteItems(aMedia);
}
}; };
libraryInit = function() { libraryInit = function() {

15
airtime_mvc/public/js/airtime/showbuilder/builder.js
View File

@ -243,11 +243,14 @@ var AIRTIME = (function(AIRTIME){
mod.fnRemove = function(aItems) { mod.fnRemove = function(aItems) {
mod.disableUI(); mod.disableUI();
if (confirm("Delete selected item(s)?")) {
$.post( "/showbuilder/schedule-remove", $.post( "/showbuilder/schedule-remove",
{"items": aItems, "format": "json"}, {"items": aItems, "format": "json"},
mod.fnItemCallback mod.fnItemCallback
); );
}else{
mod.enableUI();
}
}; };
mod.fnRemoveSelectedItems = function() { mod.fnRemoveSelectedItems = function() {
@ -1088,7 +1091,7 @@ var AIRTIME = (function(AIRTIME){
if (oItems.del !== undefined) { if (oItems.del !== undefined) {
callback = function() { callback = function() {
if (confirm("Delete selected Items?")) { if (confirm("Delete selected item?")) {
AIRTIME.showbuilder.fnRemove([{ AIRTIME.showbuilder.fnRemove([{
id: data.id, id: data.id,
timestamp: data.timestamp, timestamp: data.timestamp,