From 0b2c32c98f185c7f8d5b019b77ebb09fa74ba6b4 Mon Sep 17 00:00:00 2001
From: Allan Jardine <allan.jardine@sprymedia.co.uk>
Date: Sun, 5 Jan 2014 11:18:18 +0000
Subject: [PATCH] Merge branch 'master' of github.com:DataTables/DataTablesSrc

---
 .datatables-commit-sync       |  2 +-
 media/js/jquery.dataTables.js | 34 +++++++++++++++-------------------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/.datatables-commit-sync b/.datatables-commit-sync
index 6c701c1a..0ff8db41 100644
--- a/.datatables-commit-sync
+++ b/.datatables-commit-sync
@@ -1 +1 @@
-4e5a0aee5316508870d05d64e9dbacd3ef289441
+23e7a8a3c3e386567adf2ea3a4e454a4ca7ff2f1
diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js
index c8a9361e..8d41b2a5 100644
--- a/media/js/jquery.dataTables.js
+++ b/media/js/jquery.dataTables.js
@@ -8377,30 +8377,30 @@
 	/**
 	 * Check if a `<table>` node is a DataTable table already or not.
 	 *
-	 *  @param {node} table The `table` node to check if it is a DataTable or not
-	 *    (note that other node types can be passed in, but will always return
-	 *    false).
+	 *  @param {node|jquery|string} table Table node, jQuery object or jQuery
+	 *      selector for the table to test. Note that if more than more than one
+	 *      table is passed on, only the first will be checked
 	 *  @returns {boolean} true the table given is a DataTable, or false otherwise
 	 *  @static
 	 *  @dtopt API-Static
 	 *
 	 *  @example
-	 *    var ex = document.getElementById('example');
-	 *    if ( ! $.fn.DataTable.isDataTable( ex ) ) {
-	 *      $(ex).dataTable();
+	 *    if ( ! $.fn.DataTable.isDataTable( '#example' ) ) {
+	 *      $('#example').dataTable();
 	 *    }
 	 */
 	DataTable.isDataTable = DataTable.fnIsDataTable = function ( table )
 	{
-		var o = DataTable.settings;
+		var t = $(table).get(0);
+		var is = false;
 	
-		for ( var i=0 ; i<o.length ; i++ ) {
-			if ( o[i].nTable === table || o[i].nScrollHead === table || o[i].nScrollFoot === table ) {
-				return true;
+		$.each( DataTable.settings, function (i, o) {
+			if ( o.nTable === t || o.nScrollHead === t || o.nScrollFoot === t ) {
+				is = true;
 			}
-		}
+		} );
 	
-		return false;
+		return is;
 	};
 	
 	
@@ -8422,15 +8422,11 @@
 	 */
 	DataTable.tables = DataTable.fnTables = function ( visible )
 	{
-		var out = [];
-	
-		jQuery.each( DataTable.settings, function (i, o) {
-			if ( !visible || (visible === true && $(o.nTable).is(':visible')) ) {
-				out.push( o.nTable );
+		return jQuery.map( DataTable.settings, function (o) {
+			if ( !visible || (visible && $(o.nTable).is(':visible')) ) {
+				return o.nTable;
 			}
 		} );
-	
-		return out;
 	};