1
0
mirror of https://github.com/DataTables/DataTables.git synced 2024-12-10 22:24:10 +01:00

Merge branch 'master' of github.com:DataTables/DataTables

This commit is contained in:
Allan Jardine 2012-03-10 11:34:26 +00:00
commit d22e47ede1

View File

@ -978,7 +978,7 @@ this.fnSetColumnVis = function ( iCol, bShow, bRedraw )
var i, iLen; var i, iLen;
var aoColumns = oSettings.aoColumns; var aoColumns = oSettings.aoColumns;
var aoData = oSettings.aoData; var aoData = oSettings.aoData;
var nTd, nCell, anTrs, jqChildren, bAppend, iBefore; var nTd, bAppend, iBefore;
/* No point in doing anything if we are requesting what is already true */ /* No point in doing anything if we are requesting what is already true */
if ( aoColumns[iCol].bVisible == bShow ) if ( aoColumns[iCol].bVisible == bShow )
@ -1164,7 +1164,7 @@ this.fnSortListener = function( nNode, iColumn, fnCallback )
this.fnUpdate = function( mData, mRow, iColumn, bRedraw, bAction ) this.fnUpdate = function( mData, mRow, iColumn, bRedraw, bAction )
{ {
var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] ); var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
var iVisibleColumn, i, iLen, sDisplay; var i, iLen, sDisplay;
var iRow = (typeof mRow === 'object') ? var iRow = (typeof mRow === 'object') ?
_fnNodeToDataIndex(oSettings, mRow) : mRow; _fnNodeToDataIndex(oSettings, mRow) : mRow;