From 5703508beb3411ab9627115c726588cecebfb095 Mon Sep 17 00:00:00 2001 From: Naomi Aro Date: Wed, 22 Feb 2012 11:43:37 +0100 Subject: [PATCH] CC-3174 : showbuilder col reorder resize isn't new enough to work with the new save/load callbacks. switched to just the col reorder plugin written by Allan( datatables author) --- .../controllers/LibraryController.php | 2 +- .../library/events/library_playlistbuilder.js | 10 ++-------- .../library/events/library_showbuilder.js | 10 ++-------- airtime_mvc/public/js/airtime/library/library.js | 16 +++++++++++++--- 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 295b95d91..1418b0f0f 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.ColReorderResize.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.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/events/library_playlistbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js index aa8bb6316..b6c007485 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js @@ -41,11 +41,6 @@ var AIRTIME = (function(AIRTIME){ fnResetCol, fnAddSelectedItems; - fnResetCol = function () { - ColReorder.fnReset( oLibTable ); - return false; - }; - fnAddSelectedItems = function() { var oLibTT = TableTools.fnGetInstance('library_display'), aData = oLibTT.fnGetSelectedData(), @@ -68,9 +63,8 @@ var AIRTIME = (function(AIRTIME){ //[1] = id //[2] = enabled //[3] = click event - aButtons = [["Reset Order", "library_order_reset", true, fnResetCol], - ["Delete", "library_group_delete", true, AIRTIME.library.fnDeleteSelectedItems], - ["Add", "library_group_add", true, fnAddSelectedItems]]; + aButtons = [["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 5b49b3118..b4588dc34 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js @@ -39,11 +39,6 @@ var AIRTIME = (function(AIRTIME){ fnResetCol, fnAddSelectedItems, - fnResetCol = function () { - ColReorder.fnReset( oLibTable ); - return false; - }; - fnAddSelectedItems = function() { var oLibTT = TableTools.fnGetInstance('library_display'), oSchedTT = TableTools.fnGetInstance('show_builder_table'), @@ -78,9 +73,8 @@ var AIRTIME = (function(AIRTIME){ //[1] = id //[2] = enabled //[3] = click event - aButtons = [["Reset Order", "library_order_reset", true, fnResetCol], - ["Delete", "library_group_delete", true, AIRTIME.library.fnDeleteSelectedItems], - ["Add", "library_group_add", true, fnAddSelectedItems]]; + aButtons = [["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 9604d2e43..556780747 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -223,7 +223,9 @@ $(document).ready(function() { "bStateSave": true, "fnStateSaveParams": function (oSettings, oData) { - oData.oSearch.sSearch = ""; + //remove oData components we don't want to save. + delete oData.oSearch; + delete oData.aoSearchCols; }, "fnStateSave": function (oSettings, oData) { @@ -262,10 +264,18 @@ $(document).ready(function() { length, a = oData.abVisCols; - //datatables needs boolean type to work properly. - for (i = 0, length = oData.abVisCols.length; i < length; i++) { + //putting serialized data back into the correct js type to make + //sure everything works properly. + for (i = 0, length = a.length; i < length; i++) { a[i] = (a[i] === "true") ? true : false; } + + a = oData.ColReorder; + for (i = 0, length = a.length; i < length; i++) { + a[i] = parseInt(a[i], 10); + } + + oData.iCreate = parseInt(oData.iCreate, 10); }, "sAjaxSource": "/Library/contents",