From 391cd6a7a6c0fff29fa4b3815e1538b493d49224 Mon Sep 17 00:00:00 2001
From: Allan Jardine <allan.jardine@sprymedia.co.uk>
Date: Sun, 20 May 2012 10:33:35 +0100
Subject: [PATCH] Fix - API: $ method, when used with defered rendering, when
 all rows have not been rendered, results in jQUery trying to perform a
 selector on 'null' which throws an error. Now check for the tr having being
 created before adding it to the array to pass to jQuery - 8862

---
 media/js/jquery.dataTables.js | 42 ++++++++++++++++++++++++++---------
 media/src/api/api.methods.js  | 42 ++++++++++++++++++++++++++---------
 2 files changed, 62 insertions(+), 22 deletions(-)

diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js
index 31c93320..f1fbe4fc 100644
--- a/media/js/jquery.dataTables.js
+++ b/media/js/jquery.dataTables.js
@@ -4817,8 +4817,11 @@
 		 */
 		this.$ = function ( sSelector, oOpts )
 		{
-			var i, iLen, a = [];
+			var i, iLen, a = [], tr;
 			var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
+			var aoData = oSettings.aoData;
+			var aiDisplay = oSettings.aiDisplay;
+			var aiDisplayMaster = oSettings.aiDisplayMaster;
 		
 			if ( !oOpts )
 			{
@@ -4837,37 +4840,54 @@
 			{
 				for ( i=oSettings._iDisplayStart, iLen=oSettings.fnDisplayEnd() ; i<iLen ; i++ )
 				{
-					a.push( oSettings.aoData[ oSettings.aiDisplay[i] ].nTr );
+					tr = aoData[ aiDisplay[i] ].nTr;
+					if ( tr )
+					{
+						a.push( tr );
+					}
 				}
 			}
 			else if ( oOpts.order == "current" && oOpts.filter == "none" )
 			{
-				for ( i=0, iLen=oSettings.aiDisplayMaster.length ; i<iLen ; i++ )
+				for ( i=0, iLen=aiDisplayMaster.length ; i<iLen ; i++ )
 				{
-					a.push( oSettings.aoData[ oSettings.aiDisplayMaster[i] ].nTr );
+					tr = aoData[ aiDisplayMaster[i] ].nTr;
+					if ( tr )
+					{
+						a.push( tr );
+					}
 				}
 			}
 			else if ( oOpts.order == "current" && oOpts.filter == "applied" )
 			{
-				for ( i=0, iLen=oSettings.aiDisplay.length ; i<iLen ; i++ )
+				for ( i=0, iLen=aiDisplay.length ; i<iLen ; i++ )
 				{
-					a.push( oSettings.aoData[ oSettings.aiDisplay[i] ].nTr );
+					tr = aoData[ aiDisplay[i] ].nTr;
+					if ( tr )
+					{
+						a.push( tr );
+					}
 				}
 			}
 			else if ( oOpts.order == "original" && oOpts.filter == "none" )
 			{
-				for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
+				for ( i=0, iLen=aoData.length ; i<iLen ; i++ )
 				{
-					a.push( oSettings.aoData[ i ].nTr );
+					tr = aoData[ i ].nTr ;
+					if ( tr )
+					{
+						a.push( tr );
+					}
 				}
 			}
 			else if ( oOpts.order == "original" && oOpts.filter == "applied" )
 			{
-				for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
+				for ( i=0, iLen=aoData.length ; i<iLen ; i++ )
 				{
-					if ( $.inArray( i, oSettings.aiDisplay ) !== -1 )
+					tr = aoData[ i ].nTr;
+					if ( $.inArray( i, aiDisplay ) !== -1 && tr )
 					{
-						a.push( oSettings.aoData[ i ].nTr );
+						a.push( tr );
 					}
 				}
 			}
diff --git a/media/src/api/api.methods.js b/media/src/api/api.methods.js
index 76e58e2d..9e33c3f8 100644
--- a/media/src/api/api.methods.js
+++ b/media/src/api/api.methods.js
@@ -37,8 +37,11 @@
  */
 this.$ = function ( sSelector, oOpts )
 {
-	var i, iLen, a = [];
+	var i, iLen, a = [], tr;
 	var oSettings = _fnSettingsFromNode( this[DataTable.ext.iApiIndex] );
+	var aoData = oSettings.aoData;
+	var aiDisplay = oSettings.aiDisplay;
+	var aiDisplayMaster = oSettings.aiDisplayMaster;
 
 	if ( !oOpts )
 	{
@@ -57,37 +60,54 @@ this.$ = function ( sSelector, oOpts )
 	{
 		for ( i=oSettings._iDisplayStart, iLen=oSettings.fnDisplayEnd() ; i<iLen ; i++ )
 		{
-			a.push( oSettings.aoData[ oSettings.aiDisplay[i] ].nTr );
+			tr = aoData[ aiDisplay[i] ].nTr;
+			if ( tr )
+			{
+				a.push( tr );
+			}
 		}
 	}
 	else if ( oOpts.order == "current" && oOpts.filter == "none" )
 	{
-		for ( i=0, iLen=oSettings.aiDisplayMaster.length ; i<iLen ; i++ )
+		for ( i=0, iLen=aiDisplayMaster.length ; i<iLen ; i++ )
 		{
-			a.push( oSettings.aoData[ oSettings.aiDisplayMaster[i] ].nTr );
+			tr = aoData[ aiDisplayMaster[i] ].nTr;
+			if ( tr )
+			{
+				a.push( tr );
+			}
 		}
 	}
 	else if ( oOpts.order == "current" && oOpts.filter == "applied" )
 	{
-		for ( i=0, iLen=oSettings.aiDisplay.length ; i<iLen ; i++ )
+		for ( i=0, iLen=aiDisplay.length ; i<iLen ; i++ )
 		{
-			a.push( oSettings.aoData[ oSettings.aiDisplay[i] ].nTr );
+			tr = aoData[ aiDisplay[i] ].nTr;
+			if ( tr )
+			{
+				a.push( tr );
+			}
 		}
 	}
 	else if ( oOpts.order == "original" && oOpts.filter == "none" )
 	{
-		for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
+		for ( i=0, iLen=aoData.length ; i<iLen ; i++ )
 		{
-			a.push( oSettings.aoData[ i ].nTr );
+			tr = aoData[ i ].nTr ;
+			if ( tr )
+			{
+				a.push( tr );
+			}
 		}
 	}
 	else if ( oOpts.order == "original" && oOpts.filter == "applied" )
 	{
-		for ( i=0, iLen=oSettings.aoData.length ; i<iLen ; i++ )
+		for ( i=0, iLen=aoData.length ; i<iLen ; i++ )
 		{
-			if ( $.inArray( i, oSettings.aiDisplay ) !== -1 )
+			tr = aoData[ i ].nTr;
+			if ( $.inArray( i, aiDisplay ) !== -1 && tr )
 			{
-				a.push( oSettings.aoData[ i ].nTr );
+				a.push( tr );
 			}
 		}
 	}