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 a82614246..b9658d162 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js @@ -20,18 +20,23 @@ function fnLibraryTableDrawCallback() { /* * @param oTable the datatables instance for the library. */ -function setupLibraryToolbar(oTable) { +function setupLibraryToolbar(oLibTable) { var aButtons, - oSettings; + oLibTT = TableTools.fnGetInstance('library_display'), + fnResetCol; + + fnResetCol = function () { + ColReorder.fnReset( oLibTable ); + return false; + }; //[0] = button text //[1] = id //[2] = enabled - aButtons = [["Reset Order", "library_order_reset", true], - ["Delete", "library_group_delete", false], - ["Add", "library_group_add", false]]; + //[3] = click event + aButtons = [["Reset Order", "library_order_reset", true, fnResetCol], + ["Delete", "library_group_delete", true], + ["Add", "library_group_add", true]]; addToolBarButtonsLibrary(aButtons); - - oSettings = oTable.fnSettings(); } 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 9ef94f183..8be437a53 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js @@ -17,12 +17,11 @@ function fnLibraryTableDrawCallback() { }); } -function setupLibraryToolbar() { +function setupLibraryToolbar(oLibTable) { var aButtons, fnTest, + fnResetCol, fnAddSelectedItems, - oSettings, - oLibTable = $("#library_display").dataTable(), oSchedTable = $("#show_builder_table").dataTable(), oLibTT = TableTools.fnGetInstance('library_display'), oSchedTT = TableTools.fnGetInstance('show_builder_table'); @@ -31,6 +30,11 @@ function setupLibraryToolbar() { alert("hi"); }; + fnResetCol = function () { + ColReorder.fnReset( oLibTable ); + return false; + }; + fnAddSelectedItems = function() { var aData = oLibTT.fnGetSelectedData(), item, @@ -66,9 +70,10 @@ function setupLibraryToolbar() { //[0] = button text //[1] = id //[2] = enabled - aButtons = [["Reset Order", "library_order_reset", true, fnTest], - ["Delete", "library_group_delete", false, fnTest], - ["Add", "library_group_add", false, fnAddSelectedItems]]; + //[3] = click event + aButtons = [["Reset Order", "library_order_reset", true, fnResetCol], + ["Delete", "library_group_delete", true, fnTest], + ["Add", "library_group_add", true, fnAddSelectedItems]]; addToolBarButtonsLibrary(aButtons); } \ No newline at end of file diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 75426a001..410736402 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -337,19 +337,15 @@ function createDataTable(data) { }, "oColReorder": { - "iFixedColumns": 2 + "iFixedColumns": 2, + "aiOrder": [ 0,1,2,3,4,5,6,7,8,9 ] } }); oTable.fnSetFilteringDelay(350); setupLibraryToolbar(oTable); - - $('#library_order_reset').click(function() { - ColReorder.fnReset( oTable ); - return false; - }); - + $('[name="pl_cb_all"]').click(function(){ var oTT = TableTools.fnGetInstance('library_display');