From 072e13a943e89c9b1989c1dbdf7c7ff5495d1472 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Sun, 5 Feb 2012 19:11:48 +0100 Subject: [PATCH] CC-3174 : showbuilder add/delete buttons functions still not displaying enable/disable when needed. --- .../library/events/library_playlistbuilder.js | 4 +- .../library/events/library_showbuilder.js | 2 +- .../public/js/airtime/library/library.js | 42 +++++++++++++++++++ 3 files changed, 45 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js index ab4118934..fb8a0a526 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js @@ -68,13 +68,13 @@ var AIRTIME = (function(AIRTIME){ AIRTIME.playlist.fnAddItems(aMediaIds, undefined, 'after'); }; - + //[0] = button text //[1] = id //[2] = enabled //[3] = click event aButtons = [["Reset Order", "library_order_reset", true, fnResetCol], - ["Delete", "library_group_delete", true], + ["Delete", "library_group_delete", true, AIRTIME.library.fnDeleteSelectedItems], ["Add", "library_group_add", true, fnAddSelectedItems]]; addToolBarButtonsLibrary(aButtons); diff --git a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js index ec9cc1d1f..cf60989de 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js @@ -81,7 +81,7 @@ var AIRTIME = (function(AIRTIME){ //[2] = enabled //[3] = click event aButtons = [["Reset Order", "library_order_reset", true, fnResetCol], - ["Delete", "library_group_delete", true, fnTest], + ["Delete", "library_group_delete", true, AIRTIME.library.fnDeleteSelectedItems], ["Add", "library_group_add", true, fnAddSelectedItems]]; addToolBarButtonsLibrary(aButtons); diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index e800aaed1..294a7f4b6 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -1,3 +1,45 @@ +var AIRTIME = (function(AIRTIME){ + var mod; + + if (AIRTIME.library === undefined) { + AIRTIME.library = {} + } + mod = AIRTIME.library; + + mod.fnDeleteItems = function(aMedia) { + var oLibTT = TableTools.fnGetInstance('library_display'), + oLibTable = $("#library_display").dataTable(); + + $.post("/library/delete", + {"format": "json", "media": aMedia}, + function(json){ + oLibTT.fnSelectNone(); + oLibTable.fnDraw(); + }); + }; + + mod.fnDeleteSelectedItems = function() { + var oLibTT = TableTools.fnGetInstance('library_display'), + aData = oLibTT.fnGetSelectedData(), + item, + temp, + aMedia = []; + + //process selected files/playlists. + for (item in aData) { + temp = aData[item]; + if (temp !== null && temp.hasOwnProperty('id') ) { + aMedia.push({"id": temp.id, "type": temp.ftype}); + } + } + + AIRTIME.library.fnDeleteItems(aMedia); + }; + + return AIRTIME; + +}(AIRTIME || {})); + function addToolBarButtonsLibrary(aButtons) { var i, length = aButtons.length,