rooty/DataTables
1
0
Fork 0
mirror of https://github.com/DataTables/DataTables.git synced 2025-01-30 23:52:11 +01:00
Code Issues Releases Activity

New: Add sHeaderTH class option to the classes to match the sFooterTH

Browse Source 
option

- This fixes issue 175
This commit is contained in:
Allan Jardine 2013-06-19 17:11:21 +01:00
parent 3d1d64bc4e
commit 3d8a0d2f30
2 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
media/src/core/core.draw.js
View File

@ -99,30 +99,32 @@ function _fnBuildHead( oSettings )
var iThs = $('th, td', oSettings.nTHead).length;
var iCorrector = 0;
var jqChildren;
var classes = oSettings.oClasses;
var columns = oSettings.aoColumns;
/* If there is a header in place - then use it - otherwise it's going to get nuked... */
if ( iThs !== 0 )
{
/* We've got a thead from the DOM, so remove hidden columns and apply width to vis cols */
for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
for ( i=0, iLen=columns.length ; i<iLen ; i++ )
{
nTh = oSettings.aoColumns[i].nTh;
nTh = columns[i].nTh;
nTh.setAttribute('role', 'columnheader');
if ( oSettings.aoColumns[i].bSortable )
if ( columns[i].bSortable )
{
nTh.setAttribute('tabindex', oSettings.iTabIndex);
nTh.setAttribute('aria-controls', oSettings.sTableId);
}
if ( oSettings.aoColumns[i].sClass !== null )
if ( columns[i].sClass !== null )
{
$(nTh).addClass( oSettings.aoColumns[i].sClass );
$(nTh).addClass( columns[i].sClass );
}
/* Set the title of the column if it is user defined (not what was auto detected) */
if ( oSettings.aoColumns[i].sTitle != nTh.innerHTML )
if ( columns[i].sTitle != nTh.innerHTML )
{
nTh.innerHTML = oSettings.aoColumns[i].sTitle;
nTh.innerHTML = columns[i].sTitle;
}
}
}
@ -131,15 +133,15 @@ function _fnBuildHead( oSettings )
/* We don't have a header in the DOM - so we are going to have to create one */
var nTr = document.createElement( "tr" );
for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
for ( i=0, iLen=columns.length ; i<iLen ; i++ )
{
nTh = oSettings.aoColumns[i].nTh;
nTh.innerHTML = oSettings.aoColumns[i].sTitle;
nTh = columns[i].nTh;
nTh.innerHTML = columns[i].sTitle;
nTh.setAttribute('tabindex', '0');
if ( oSettings.aoColumns[i].sClass !== null )
if ( columns[i].sClass !== null )
{
$(nTh).addClass( oSettings.aoColumns[i].sClass );
$(nTh).addClass( columns[i].sClass );
}
nTr.appendChild( nTh );
@ -154,16 +156,16 @@ function _fnBuildHead( oSettings )
/* Add the extra markup needed by jQuery UI's themes */
if ( oSettings.bJUI )
{
for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
for ( i=0, iLen=columns.length ; i<iLen ; i++ )
{
nTh = oSettings.aoColumns[i].nTh;
nTh = columns[i].nTh;
var nDiv = document.createElement('div');
nDiv.className = oSettings.oClasses.sSortJUIWrapper;
nDiv.className = classes.sSortJUIWrapper;
$(nTh).contents().appendTo(nDiv);
var nSpan = document.createElement('span');
nSpan.className = oSettings.oClasses.sSortIcon+' '+oSettings.aoColumns[i].sSortingClassJUI;
nSpan.className = classes.sSortIcon+' '+columns[i].sSortingClassJUI;
nDiv.appendChild( nSpan );
nTh.appendChild( nDiv );
}
@ -171,35 +173,33 @@ function _fnBuildHead( oSettings )
if ( oSettings.oFeatures.bSort )
{
for ( i=0 ; i<oSettings.aoColumns.length ; i++ )
for ( i=0 ; i<columns.length ; i++ )
{
$(oSettings.aoColumns[i].nTh).addClass( oSettings.aoColumns[i].sSortingClass );
$(columns[i].nTh).addClass( columns[i].sSortingClass );
if ( oSettings.aoColumns[i].bSortable !== false )
if ( columns[i].bSortable !== false )
{
_fnSortAttachListener( oSettings, oSettings.aoColumns[i].nTh, i );
_fnSortAttachListener( oSettings, columns[i].nTh, i );
}
}
}
/* Deal with the footer - add classes if required */
if ( oSettings.oClasses.sFooterTH !== "" )
{
$(oSettings.nTFoot).children('tr').children('th').addClass( oSettings.oClasses.sFooterTH );
}
$(oSettings.nTHead).find('>tr>th, >tr>td').addClass( classes.sHeaderTH );
$(oSettings.nTFoot).find('>tr>th, >tr>td').addClass( classes.sFooterTH );
/* Cache the footer elements */
if ( oSettings.nTFoot !== null )
{
var anCells = _fnGetUniqueThs( oSettings, null, oSettings.aoFooter );
for ( i=0, iLen=oSettings.aoColumns.length ; i<iLen ; i++ )
for ( i=0, iLen=columns.length ; i<iLen ; i++ )
{
if ( anCells[i] )
{
oSettings.aoColumns[i].nTf = anCells[i];
if ( oSettings.aoColumns[i].sClass )
columns[i].nTf = anCells[i];
if ( columns[i].sClass )
{
$(anCells[i]).addClass( oSettings.aoColumns[i].sClass );
$(anCells[i]).addClass( columns[i].sClass );
}
}
}

2
media/src/ext/ext.classes.js
View File

@ -47,6 +47,7 @@ $.extend( DataTable.ext.oStdClasses, {
"sScrollFootInner": "dataTables_scrollFootInner",
/* Misc */
"sHeaderTH": "",
"sFooterTH": "",
"sJUIHeader": "",
"sJUIFooter": ""
@ -83,6 +84,7 @@ $.extend( DataTable.ext.oJUIClasses, DataTable.ext.oStdClasses, {
"sScrollFoot": "dataTables_scrollFoot ui-state-default",
/* Misc */
"sHeaderTH": "ui-state-default",
"sFooterTH": "ui-state-default",
"sJUIHeader": "fg-toolbar ui-toolbar ui-widget-header ui-corner-tl ui-corner-tr ui-helper-clearfix",
"sJUIFooter": "fg-toolbar ui-toolbar ui-widget-header ui-corner-bl ui-corner-br ui-helper-clearfix"