diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 1418b0f0f..295b95d91 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -47,7 +47,7 @@ class LibraryController extends Zend_Controller_Action $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.pluginAPI.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.fnSetFilteringDelay.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColVis.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorder.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorderResize.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.FixedColumns.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.TableTools.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 3f1a24f17..9604d2e43 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -221,6 +221,10 @@ $(document).ready(function() { "bServerSide": true, "bStateSave": true, + + "fnStateSaveParams": function (oSettings, oData) { + oData.oSearch.sSearch = ""; + }, "fnStateSave": function (oSettings, oData) { $.ajax({ @@ -228,9 +232,7 @@ $(document).ready(function() { type: "POST", data: {settings : oData, format: "json"}, dataType: "json", - success: function(){ - var x; - }, + success: function(){}, error: function (jqXHR, textStatus, errorThrown) { var x; } @@ -255,16 +257,26 @@ $(document).ready(function() { return o; }, + "fnStateLoadParams": function (oSettings, oData) { + var i, + length, + a = oData.abVisCols; + + //datatables needs boolean type to work properly. + for (i = 0, length = oData.abVisCols.length; i < length; i++) { + a[i] = (a[i] === "true") ? true : false; + } + }, "sAjaxSource": "/Library/contents", - "fnServerData": function ( sSource, aoData, testCallback ) { + "fnServerData": function ( sSource, aoData, fnCallback ) { aoData.push( { name: "format", value: "json"} ); $.ajax( { "dataType": 'json', "type": "GET", "url": sSource, "data": aoData, - "success": testCallback + "success": fnCallback } ); }, "fnRowCallback": AIRTIME.library.events.fnRowCallback,