rooty/DataTables
1
0
Fork 0
mirror of https://github.com/DataTables/DataTables.git synced 2025-02-07 05:54:15 +01:00
Code Issues Releases Activity

Dev: Tidy up _fnColumnIndexToVisible and _fnVisibleToColumnIndex to use the new _fnGetColumns method.

Browse Source
This commit is contained in:
Allan Jardine 2012-07-31 09:39:51 +01:00
parent d034d187bd
commit 5311067cd2
2 changed files with 18 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -229,22 +229,11 @@
*/ */
function _fnVisibleToColumnIndex( oSettings, iMatch ) function _fnVisibleToColumnIndex( oSettings, iMatch )
{ {
var iColumn = -1; var aiVis = _fnGetColumns( oSettings, 'bVisible' );
for ( var i=0 ; i<oSettings.aoColumns.length ; i++ ) return typeof aiVis[iMatch] === 'number' ?
{ aiVis[iMatch] :
if ( oSettings.aoColumns[i].bVisible === true ) null;
{
iColumn++;
}
if ( iColumn == iMatch )
{
return i;
}
}
return null;
} }
@ -258,21 +247,10 @@
*/ */
function _fnColumnIndexToVisible( oSettings, iMatch ) function _fnColumnIndexToVisible( oSettings, iMatch )
{ {
var iVisible = -1; var aiVis = _fnGetColumns( oSettings, 'bVisible' );
for ( var i=0 ; i<oSettings.aoColumns.length ; i++ ) var iPos = $.inArray( iMatch, aiVis );
{
if ( oSettings.aoColumns[i].bVisible === true ) return iPos !== -1 ? iPos : null;
{
iVisible++;
}
if ( i == iMatch )
{
return oSettings.aoColumns[i].bVisible === true ? iVisible : null;
}
}
return null;
} }

40
media/src/core/core.columns.js
View File

@ -169,22 +169,11 @@ function _fnAdjustColumnSizing ( oSettings )
*/ */
function _fnVisibleToColumnIndex( oSettings, iMatch ) function _fnVisibleToColumnIndex( oSettings, iMatch )
{ {
var iColumn = -1; var aiVis = _fnGetColumns( oSettings, 'bVisible' );
for ( var i=0 ; i<oSettings.aoColumns.length ; i++ ) return typeof aiVis[iMatch] === 'number' ?
{ aiVis[iMatch] :
if ( oSettings.aoColumns[i].bVisible === true ) null;
{
iColumn++;
}
if ( iColumn == iMatch )
{
return i;
}
}
return null;
} }
@ -198,21 +187,10 @@ function _fnVisibleToColumnIndex( oSettings, iMatch )
*/ */
function _fnColumnIndexToVisible( oSettings, iMatch ) function _fnColumnIndexToVisible( oSettings, iMatch )
{ {
var iVisible = -1; var aiVis = _fnGetColumns( oSettings, 'bVisible' );
for ( var i=0 ; i<oSettings.aoColumns.length ; i++ ) var iPos = $.inArray( iMatch, aiVis );
{
if ( oSettings.aoColumns[i].bVisible === true ) return iPos !== -1 ? iPos : null;
{
iVisible++;
}
if ( i == iMatch )
{
return oSettings.aoColumns[i].bVisible === true ? iVisible : null;
}
}
return null;
} }