Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Naomi Aro 2012-02-22 11:43:37 +01:00
parent 5f89975c64
commit 5703508beb
4 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/controllers/LibraryController.php
View File

@ -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.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.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.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.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'); $this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.TableTools.js?'.$CC_CONFIG['airtime_version'],'text/javascript');

10
airtime_mvc/public/js/airtime/library/events/library_playlistbuilder.js
View File

@ -41,11 +41,6 @@ var AIRTIME = (function(AIRTIME){
fnResetCol, fnResetCol,
fnAddSelectedItems; fnAddSelectedItems;
fnResetCol = function () {
ColReorder.fnReset( oLibTable );
return false;
};
fnAddSelectedItems = function() { fnAddSelectedItems = function() {
var oLibTT = TableTools.fnGetInstance('library_display'), var oLibTT = TableTools.fnGetInstance('library_display'),
aData = oLibTT.fnGetSelectedData(), aData = oLibTT.fnGetSelectedData(),
@ -68,9 +63,8 @@ var AIRTIME = (function(AIRTIME){
//[1] = id //[1] = id
//[2] = enabled //[2] = enabled
//[3] = click event //[3] = click event
aButtons = [["Reset Order", "library_order_reset", true, fnResetCol], aButtons = [["Delete", "library_group_delete", true, AIRTIME.library.fnDeleteSelectedItems],
["Delete", "library_group_delete", true, AIRTIME.library.fnDeleteSelectedItems], ["Add", "library_group_add", true, fnAddSelectedItems]];
["Add", "library_group_add", true, fnAddSelectedItems]];
addToolBarButtonsLibrary(aButtons); addToolBarButtonsLibrary(aButtons);
}; };

10
airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
View File

@ -39,11 +39,6 @@ var AIRTIME = (function(AIRTIME){
fnResetCol, fnResetCol,
fnAddSelectedItems, fnAddSelectedItems,
fnResetCol = function () {
ColReorder.fnReset( oLibTable );
return false;
};
fnAddSelectedItems = function() { fnAddSelectedItems = function() {
var oLibTT = TableTools.fnGetInstance('library_display'), var oLibTT = TableTools.fnGetInstance('library_display'),
oSchedTT = TableTools.fnGetInstance('show_builder_table'), oSchedTT = TableTools.fnGetInstance('show_builder_table'),
@ -78,9 +73,8 @@ var AIRTIME = (function(AIRTIME){
//[1] = id //[1] = id
//[2] = enabled //[2] = enabled
//[3] = click event //[3] = click event
aButtons = [["Reset Order", "library_order_reset", true, fnResetCol], aButtons = [["Delete", "library_group_delete", true, AIRTIME.library.fnDeleteSelectedItems],
["Delete", "library_group_delete", true, AIRTIME.library.fnDeleteSelectedItems], ["Add", "library_group_add", true, fnAddSelectedItems]];
["Add", "library_group_add", true, fnAddSelectedItems]];
addToolBarButtonsLibrary(aButtons); addToolBarButtonsLibrary(aButtons);
}; };

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

@ -223,7 +223,9 @@ $(document).ready(function() {
"bStateSave": true, "bStateSave": true,
"fnStateSaveParams": function (oSettings, oData) { "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) { "fnStateSave": function (oSettings, oData) {
@ -262,10 +264,18 @@ $(document).ready(function() {
length, length,
a = oData.abVisCols; a = oData.abVisCols;
//datatables needs boolean type to work properly. //putting serialized data back into the correct js type to make
for (i = 0, length = oData.abVisCols.length; i < length; i++) { //sure everything works properly.
for (i = 0, length = a.length; i < length; i++) {
a[i] = (a[i] === "true") ? true : false; 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", "sAjaxSource": "/Library/contents",