rooty/DataTables
1
0
Fork 0
mirror of https://github.com/DataTables/DataTables.git synced 2024-12-02 14:24:11 +01:00
Code Issues Releases Activity

Dev fix: Clean up the calls to _fnDrawHead

Browse Source
This commit is contained in:
Allan Jardine 2011-04-27 19:18:08 +01:00
parent e8e30c35e0
commit f3bd978b8f
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
media/js/jquery.dataTables.js vendored
View File

@ -2087,10 +2087,10 @@
oSettings.aoColumns[iCol].bVisible = bShow; oSettings.aoColumns[iCol].bVisible = bShow;
/* Redraw the header and footer based on the new column visibility */ /* Redraw the header and footer based on the new column visibility */
_fnDrawHead( oSettings, oSettings.aoHeader, oSettings.nTHead ); _fnDrawHead( oSettings, oSettings.aoHeader );
if ( oSettings.nTFoot ) if ( oSettings.nTFoot )
{ {
_fnDrawHead( oSettings, oSettings.aoFooter, oSettings.nTFoot ); _fnDrawHead( oSettings, oSettings.aoFooter );
} }
/* If there are any 'open' rows, then we need to alter the colspan for this col change */ /* If there are any 'open' rows, then we need to alter the colspan for this col change */
@ -2344,10 +2344,10 @@
/* Build and draw the header / footer for the table */ /* Build and draw the header / footer for the table */
_fnBuildHead( oSettings ); _fnBuildHead( oSettings );
_fnDrawHead( oSettings, oSettings.aoHeader, oSettings.nTHead ); _fnDrawHead( oSettings, oSettings.aoHeader );
if ( oSettings.nTFoot ) if ( oSettings.nTFoot )
{ {
_fnDrawHead( oSettings, oSettings.aoFooter, oSettings.nTFoot ); _fnDrawHead( oSettings, oSettings.aoFooter );
} }
/* Okay to show that something is going on now */ /* Okay to show that something is going on now */
@ -3058,9 +3058,10 @@
* Returns: - * Returns: -
* Inputs: object:oSettings - dataTables settings object * Inputs: object:oSettings - dataTables settings object
* array objects:aoSource - Layout array from _fnDetectHeader * array objects:aoSource - Layout array from _fnDetectHeader
* node:nTarget - The header or footer element to layout * boolean:bIncludeHidden - If true then include the hidden columns in the calc,
* - optional: default false
*/ */
function _fnDrawHead( oSettings, aoSource, nTarget ) function _fnDrawHead( oSettings, aoSource, bIncludeHidden )
{ {
var i, iLen, j, jLen, k, kLen; var i, iLen, j, jLen, k, kLen;
var aoLocal = []; var aoLocal = [];
@ -3068,6 +3069,11 @@
var iColumns = oSettings.aoColumns.length; var iColumns = oSettings.aoColumns.length;
var iRowspan, iColspan; var iRowspan, iColspan;
if ( typeof bIncludeHidden == 'undefined' )
{
bIncludeHidden = false;
}
/* Make a copy of the master layout array, but without the visible columns in it */ /* Make a copy of the master layout array, but without the visible columns in it */
for ( i=0, iLen=aoSource.length ; i<iLen ; i++ ) for ( i=0, iLen=aoSource.length ; i<iLen ; i++ )
{ {
@ -3077,7 +3083,7 @@
/* Remove any columns which are currently hidden */ /* Remove any columns which are currently hidden */
for ( j=iColumns-1 ; j>=0 ; j-- ) for ( j=iColumns-1 ; j>=0 ; j-- )
{ {
if ( !oSettings.aoColumns[j].bVisible ) if ( !oSettings.aoColumns[j].bVisible && !bIncludeHidden )
{ {
aoLocal[i].splice( j, 1 ); aoLocal[i].splice( j, 1 );
} }