Update fnFindCellRowNodes.js and fnFindCellRowIndexes.js to work with

objects - Based on the discussion here: http://datatables.net/forums/discussion/19044 - Use fnGetData to get the data for a cell, regardless of data source
piprog · Jan 10, 2014 · f3e99a6 · f3e99a6
1 parent 40e2d46
commit f3e99a6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/api/fnFindCellRowIndexes.js b/api/fnFindCellRowIndexes.js
@@ -25,24 +25,27 @@
 jQuery.fn.dataTableExt.oApi.fnFindCellRowIndexes = function ( oSettings, sSearch, iColumn )
 {
 	var
-		i,iLen, j, jLen,
-		aOut = [], aData;
+		i,iLen, j, jLen, val,
+		aOut = [], aData,
+		columns = oSettings.aoColumns;
 
 	for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
 	{
 		aData = oSettings.aoData[i]._aData;
 
 		if ( iColumn === undefined )
 		{
-			for ( j=0, jLen=aData.length ; j<jLen ; j++ )
+			for ( j=0, jLen=columns.length ; j<jLen ; j++ )
 			{
-				if ( aData[j] == sSearch )
+				val = this.fnGetData(i, j);
+
+				if ( val == sSearch )
 				{
 					aOut.push( i );
 				}
 			}
 		}
-		else if ( aData[iColumn] == sSearch )
+		else if (this.fnGetData(i, iColumn) == sSearch )
 		{
 			aOut.push( i );
 		}

diff --git a/api/fnFindCellRowNodes.js b/api/fnFindCellRowNodes.js
@@ -25,24 +25,27 @@
 jQuery.fn.dataTableExt.oApi.fnFindCellRowNodes = function ( oSettings, sSearch, iColumn )
 {
 	var
-		i,iLen, j, jLen,
-		aOut = [], aData;
+		i,iLen, j, jLen, val,
+		aOut = [], aData,
+		columns = oSettings.aoColumns;
 
 	for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
 	{
 		aData = oSettings.aoData[i]._aData;
 
 		if ( iColumn === undefined )
 		{
-			for ( j=0, jLen=aData.length ; j<jLen ; j++ )
+			for ( j=0, jLen=columns.length ; j<jLen ; j++ )
 			{
-				if ( aData[j] == sSearch )
+				val = this.fnGetData(i, j);
+
+				if ( val == sSearch )
 				{
 					aOut.push( oSettings.aoData[i].nTr );
 				}
 			}
 		}
-		else if ( aData[iColumn] == sSearch )
+		else if (this.fnGetData(i, iColumn) == sSearch )
 		{
 			aOut.push( oSettings.aoData[i].nTr );
 		}