From c8c40189a260d2644553f40a74a014240a6c1f6d Mon Sep 17 00:00:00 2001
From: Allan Jardine <allan.jardine@sprymedia.co.uk>
Date: Wed, 14 Dec 2011 10:48:15 +0000
Subject: [PATCH] Remove pointless duplication of code - it was doing the same
 thing, just with different pointers

---
 media/js/jquery.dataTables.js | 24 +++++++++---------------
 media/src/api/api.methods.js  | 21 +++++++--------------
 2 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js
index e70b4f5a..ea894113 100644
--- a/media/js/jquery.dataTables.js
+++ b/media/js/jquery.dataTables.js
@@ -5122,21 +5122,14 @@
 			
 			$(_fnGetTrNodes( oSettings )).removeClass( oSettings.asStripeClasses.join(' ') );
 			
-			if ( !oSettings.bJUI )
+			$('th', oSettings.nTHead).removeClass( [
+				oSettings.oClasses.sSortable,
+				oSettings.oClasses.sSortableAsc,
+				oSettings.oClasses.sSortableDesc,
+				oSettings.oClasses.sSortableNone ].join(' ')
+			);
+			if ( oSettings.bJUI )
 			{
-				$('th', oSettings.nTHead).removeClass( [ DataTable.ext.oStdClasses.sSortable,
-					DataTable.ext.oStdClasses.sSortableAsc,
-					DataTable.ext.oStdClasses.sSortableDesc,
-					DataTable.ext.oStdClasses.sSortableNone ].join(' ')
-				);
-			}
-			else
-			{
-				$('th, td', oSettings.nTHead).removeClass( [ DataTable.ext.oStdClasses.sSortable,
-					DataTable.ext.oJUIClasses.sSortableAsc,
-					DataTable.ext.oJUIClasses.sSortableDesc,
-					DataTable.ext.oJUIClasses.sSortableNone ].join(' ')
-				);
 				$('th span.'+DataTable.ext.oJUIClasses.sSortIcon
 					+ ', td span.'+DataTable.ext.oJUIClasses.sSortIcon, oSettings.nTHead).remove();
 		
@@ -8416,7 +8409,8 @@
 		 * and filtering) by adding a tabindex attribute to the required elements. This
 		 * allows you to tab through the controls and press the enter key to activate them.
 		 * The tabindex is default 0, meaning that the tab follows the flow of the document.
-		 * You can overrule this using this parameter if you wish.
+		 * You can overrule this using this parameter if you wish. Use a value of -1 to
+		 * disable built-in keyboard navigation.
 		 *  @type int
 		 *  @default 0
 		 * 
diff --git a/media/src/api/api.methods.js b/media/src/api/api.methods.js
index 7dff773b..ebf52ac4 100644
--- a/media/src/api/api.methods.js
+++ b/media/src/api/api.methods.js
@@ -416,21 +416,14 @@ this.fnDestroy = function ( bRemove )
 	
 	$(_fnGetTrNodes( oSettings )).removeClass( oSettings.asStripeClasses.join(' ') );
 	
-	if ( !oSettings.bJUI )
+	$('th', oSettings.nTHead).removeClass( [
+		oSettings.oClasses.sSortable,
+		oSettings.oClasses.sSortableAsc,
+		oSettings.oClasses.sSortableDesc,
+		oSettings.oClasses.sSortableNone ].join(' ')
+	);
+	if ( oSettings.bJUI )
 	{
-		$('th', oSettings.nTHead).removeClass( [ DataTable.ext.oStdClasses.sSortable,
-			DataTable.ext.oStdClasses.sSortableAsc,
-			DataTable.ext.oStdClasses.sSortableDesc,
-			DataTable.ext.oStdClasses.sSortableNone ].join(' ')
-		);
-	}
-	else
-	{
-		$('th, td', oSettings.nTHead).removeClass( [ DataTable.ext.oStdClasses.sSortable,
-			DataTable.ext.oJUIClasses.sSortableAsc,
-			DataTable.ext.oJUIClasses.sSortableDesc,
-			DataTable.ext.oJUIClasses.sSortableNone ].join(' ')
-		);
 		$('th span.'+DataTable.ext.oJUIClasses.sSortIcon
 			+ ', td span.'+DataTable.ext.oJUIClasses.sSortIcon, oSettings.nTHead).remove();