From 5311067cd242502a35a05d080c4ca0f861061cfc Mon Sep 17 00:00:00 2001
From: Allan Jardine <allan.jardine@sprymedia.co.uk>
Date: Tue, 31 Jul 2012 09:39:51 +0100
Subject: [PATCH] Dev: Tidy up _fnColumnIndexToVisible and
 _fnVisibleToColumnIndex to use the new _fnGetColumns method.

---
 media/js/jquery.dataTables.js  | 40 ++++++++--------------------------
 media/src/core/core.columns.js | 40 ++++++++--------------------------
 2 files changed, 18 insertions(+), 62 deletions(-)

diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js
index 3c49e663..a7ddc4e3 100644
--- a/media/js/jquery.dataTables.js
+++ b/media/js/jquery.dataTables.js
@@ -229,22 +229,11 @@
 		 */
 		function _fnVisibleToColumnIndex( oSettings, iMatch )
 		{
-			var iColumn = -1;
-			
-			for ( var i=0 ; i<oSettings.aoColumns.length ; i++ )
-			{
-				if ( oSettings.aoColumns[i].bVisible === true )
-				{
-					iColumn++;
-				}
-				
-				if ( iColumn == iMatch )
-				{
-					return i;
-				}
-			}
-			
-			return null;
+			var aiVis = _fnGetColumns( oSettings, 'bVisible' );
+		
+			return typeof aiVis[iMatch] === 'number' ?
+				aiVis[iMatch] :
+				null;
 		}
 		
 		
@@ -258,21 +247,10 @@
 		 */
 		function _fnColumnIndexToVisible( oSettings, iMatch )
 		{
-			var iVisible = -1;
-			for ( var i=0 ; i<oSettings.aoColumns.length ; i++ )
-			{
-				if ( oSettings.aoColumns[i].bVisible === true )
-				{
-					iVisible++;
-				}
-				
-				if ( i == iMatch )
-				{
-					return oSettings.aoColumns[i].bVisible === true ? iVisible : null;
-				}
-			}
-			
-			return null;
+			var aiVis = _fnGetColumns( oSettings, 'bVisible' );
+			var iPos = $.inArray( iMatch, aiVis );
+		
+			return iPos !== -1 ? iPos : null;
 		}
 		
 		
diff --git a/media/src/core/core.columns.js b/media/src/core/core.columns.js
index 8494e110..40297cdc 100644
--- a/media/src/core/core.columns.js
+++ b/media/src/core/core.columns.js
@@ -169,22 +169,11 @@ function _fnAdjustColumnSizing ( oSettings )
  */
 function _fnVisibleToColumnIndex( oSettings, iMatch )
 {
-	var iColumn = -1;
-	
-	for ( var i=0 ; i<oSettings.aoColumns.length ; i++ )
-	{
-		if ( oSettings.aoColumns[i].bVisible === true )
-		{
-			iColumn++;
-		}
-		
-		if ( iColumn == iMatch )
-		{
-			return i;
-		}
-	}
-	
-	return null;
+	var aiVis = _fnGetColumns( oSettings, 'bVisible' );
+
+	return typeof aiVis[iMatch] === 'number' ?
+		aiVis[iMatch] :
+		null;
 }
 
 
@@ -198,21 +187,10 @@ function _fnVisibleToColumnIndex( oSettings, iMatch )
  */
 function _fnColumnIndexToVisible( oSettings, iMatch )
 {
-	var iVisible = -1;
-	for ( var i=0 ; i<oSettings.aoColumns.length ; i++ )
-	{
-		if ( oSettings.aoColumns[i].bVisible === true )
-		{
-			iVisible++;
-		}
-		
-		if ( i == iMatch )
-		{
-			return oSettings.aoColumns[i].bVisible === true ? iVisible : null;
-		}
-	}
-	
-	return null;
+	var aiVis = _fnGetColumns( oSettings, 'bVisible' );
+	var iPos = $.inArray( iMatch, aiVis );
+
+	return iPos !== -1 ? iPos : null;
 }