From d7058eb45d5d71afade747107cbe58fa32843b05 Mon Sep 17 00:00:00 2001
From: Allan Jardine <allan.jardine@sprymedia.co.uk>
Date: Mon, 29 Apr 2013 07:51:41 +0100
Subject: [PATCH] New: search() and columns().search() API methods

- Ability to filter the table through the new API.

- This effectively replaces the fnFilter method of the old API.

- Note that one capability which has been removed from the old API is the
  ability to not show the new filter on the filtering input elements. I
  can't see any use for that feature to be honest, so it has been
  dropped. The filtering inputs always show the global filter state now.

- Additionally, note that we've been forced to call this `search` here
  rather than `filter` since there is a `filter` method for the API
  collection instance. This might be revisted before release.
---
 media/src/DataTables.js        |  3 ++-
 media/src/api/api.columns.js   |  4 +++-
 media/src/api/api.core.js      |  6 +++---
 media/src/core/core.data.js    |  4 ++--
 media/src/core/core.filter.js  | 12 ++++++------
 media/src/core/core.length.js  | 23 ++---------------------
 media/src/core/core.support.js | 21 +++++++++++++++++++++
 7 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/media/src/DataTables.js b/media/src/DataTables.js
index a9b89d41..5897f0a4 100644
--- a/media/src/DataTables.js
+++ b/media/src/DataTables.js
@@ -99,7 +99,7 @@
 	{
 		require('api.methods.js');
 		require('api.internal.js');
-		
+
 		var _that = this;
 		this.each(function() {
 			require('core.constructor.js');
@@ -117,6 +117,7 @@
 	require('api._selectors.js');
 	require('api.rows.js');
 	require('api.columns.js');
+	require('api.search.js');
 	require('api.static.js');
 
 	/**
diff --git a/media/src/api/api.columns.js b/media/src/api/api.columns.js
index 76db6423..43e5c3cd 100644
--- a/media/src/api/api.columns.js
+++ b/media/src/api/api.columns.js
@@ -135,12 +135,14 @@ _api.register( 'columns().visible()', function ( vis ) {
 // } );
 
 
+
 _api.register( 'columns.adjust()', function () {
-	this.iterator( 'table', function ( settings ) {
+	return this.iterator( 'table', function ( settings ) {
 		_fnAdjustColumnSizing( settings );
 	} );
 } );
 
+
 // Convert from one column index type, to another type
 _api.register( 'column.index()', function ( type, idx ) {
 	if ( this.context.length !== 0 ) {
diff --git a/media/src/api/api.core.js b/media/src/api/api.core.js
index 12744810..10cc2fa2 100644
--- a/media/src/api/api.core.js
+++ b/media/src/api/api.core.js
@@ -283,7 +283,7 @@ _Api.prototype = /** @lends DataTables.Api */{
 				fn.call( this, this[i], i, this );
 			}
 		}
-	
+
 		return this;
 	},
 
@@ -336,7 +336,7 @@ _Api.prototype = /** @lends DataTables.Api */{
 
 		for ( i=0, ien=context.length ; i<ien ; i++ ) {
 			if ( type === 'table' ) {
-				ret = fn( context[i] );
+				ret = fn( context[i], i );
 
 				if ( ret !== undefined ) {
 					a.push( ret );
@@ -344,7 +344,7 @@ _Api.prototype = /** @lends DataTables.Api */{
 			}
 			else if ( type === 'columns' || type === 'rows' ) {
 				// this has same length as context - one entry for each table
-				ret = fn( context[i], this[i] );
+				ret = fn( context[i], this[i], i );
 
 				if ( ret !== undefined ) {
 					a.push( ret );
diff --git a/media/src/core/core.data.js b/media/src/core/core.data.js
index d56abc9d..94535eb1 100644
--- a/media/src/core/core.data.js
+++ b/media/src/core/core.data.js
@@ -495,7 +495,7 @@ function _fnClearTable( oSettings )
  *  @param {int} iTarget value to find
  *  @memberof DataTable#oApi
  */
-function _fnDeleteIndex( a, iTarget )
+function _fnDeleteIndex( a, iTarget, splice )
 {
 	var iTargetIndex = -1;
 	
@@ -511,7 +511,7 @@ function _fnDeleteIndex( a, iTarget )
 		}
 	}
 	
-	if ( iTargetIndex != -1 )
+	if ( iTargetIndex != -1 && splice === undefined )
 	{
 		a.splice( iTargetIndex, 1 );
 	}
diff --git a/media/src/core/core.filter.js b/media/src/core/core.filter.js
index ef28e6e2..cbd24eec 100644
--- a/media/src/core/core.filter.js
+++ b/media/src/core/core.filter.js
@@ -8,12 +8,12 @@
 function _fnFeatureHtmlFilter ( oSettings )
 {
 	var oPreviousSearch = oSettings.oPreviousSearch;
-	
+
 	var sSearchStr = oSettings.oLanguage.sSearch;
 	sSearchStr = (sSearchStr.indexOf('_INPUT_') !== -1) ?
 	  sSearchStr.replace('_INPUT_', '<input type="search" />') :
 	  sSearchStr==="" ? '<input type="search" />' : sSearchStr+' <input type="search" />';
-	
+
 	var nFilter = document.createElement( 'div' );
 	nFilter.className = oSettings.oClasses.sFilter;
 	nFilter.innerHTML = '<label>'+sSearchStr+'</label>';
@@ -21,7 +21,7 @@ function _fnFeatureHtmlFilter ( oSettings )
 	{
 		nFilter.id = oSettings.sTableId+'_filter';
 	}
-	
+
 	var jqFilter = $('input[type="search"]', nFilter);
 
 	// Store a reference to the input element, so other input elements could be
@@ -41,7 +41,7 @@ function _fnFeatureHtmlFilter ( oSettings )
 				$(n[i]._DT_Input).val( val );
 			}
 		}
-		
+
 		/* Now do the filter */
 		if ( val != oPreviousSearch.sSearch )
 		{
@@ -68,7 +68,7 @@ function _fnFeatureHtmlFilter ( oSettings )
 			}
 		}
 	);
-	
+
 	return nFilter;
 }
 
@@ -100,7 +100,7 @@ function _fnFilterComplete ( oSettings, oInput, iForce )
 		fnSaveFilter( oInput );
 
 		/* Now do the individual column filter */
-		for ( var i=0 ; i<oSettings.aoPreSearchCols.length ; i++ )
+		for ( var i=0 ; i<aoPrevSearch.length ; i++ )
 		{
 			_fnFilterColumn( oSettings, aoPrevSearch[i].sSearch, i, aoPrevSearch[i].bRegex,
 				aoPrevSearch[i].bSmart, aoPrevSearch[i].bCaseInsensitive );
diff --git a/media/src/core/core.length.js b/media/src/core/core.length.js
index 288cddad..a85ceadd 100644
--- a/media/src/core/core.length.js
+++ b/media/src/core/core.length.js
@@ -1,29 +1,10 @@
 
 function _fnLengthChange ( settings, val )
 {
-	var
-		start = settings._iDisplayStart,
-		records = settings.fnRecordsDisplay(),
-		end,
-		len = parseInt( val, 10 );
-
-	/* Redraw the table */
+	var len = parseInt( val, 10 );
 	settings._iDisplayLength = len;
 
-	end = settings.fnDisplayEnd();
-	
-	/* If we have space to show extra rows (backing up from the end point - then do so */
-	if ( end === records )
-	{
-		start = end - len;
-	}
-	
-	if ( len === -1 || start < 0 )
-	{
-		start = 0;
-	}
-
-	settings._iDisplayStart = start;
+	_fnLengthOverflow( settings );
 
 	// Fire length change event
 	$(settings.oInstance).trigger( 'length', [settings, len] );
diff --git a/media/src/core/core.support.js b/media/src/core/core.support.js
index 45297424..10b7dca9 100644
--- a/media/src/core/core.support.js
+++ b/media/src/core/core.support.js
@@ -189,3 +189,24 @@ function _fnCallbackFire( oSettings, sStore, sTrigger, aArgs )
 	return aRet;
 }
 
+
+function _fnLengthOverflow ( settings )
+{
+	var
+		start = settings._iDisplayStart,
+		end = settings.fnDisplayEnd(),
+		len = settings._iDisplayLength;
+
+	/* If we have space to show extra rows (backing up from the end point - then do so */
+	if ( end === settings.fnRecordsDisplay() )
+	{
+		start = end - len;
+	}
+
+	if ( len === -1 || start < 0 )
+	{
+		start = 0;
+	}
+
+	settings._iDisplayStart = start;
+}
\ No newline at end of file