From d9e02ab5c8a7ef38232d0b3742346b242e7bf262 Mon Sep 17 00:00:00 2001
From: Allan Jardine <allan.jardine@sprymedia.co.uk>
Date: Sun, 11 Dec 2011 08:44:28 +0000
Subject: [PATCH] Pull the Ajax functions into their own file

---
 media/js/jquery.dataTables.js | 365 +++++++++++++++++-----------------
 media/src/DataTables.js       |   1 +
 media/src/core/core.draw.js   | 182 -----------------
 3 files changed, 184 insertions(+), 364 deletions(-)

diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js
index 1d20bfe4..d63050cd 100644
--- a/media/js/jquery.dataTables.js
+++ b/media/js/jquery.dataTables.js
@@ -1523,188 +1523,6 @@
 		}
 		
 		
-		/**
-		 * Update the table using an Ajax call
-		 *  @param {object} oSettings dataTables settings object
-		 *  @returns {boolean} Block the table drawing or not
-		 *  @private
-		 */
-		function _fnAjaxUpdate( oSettings )
-		{
-			if ( oSettings.bAjaxDataGet )
-			{
-				oSettings.iDraw++;
-				_fnProcessingDisplay( oSettings, true );
-				var iColumns = oSettings.aoColumns.length;
-				var aoData = _fnAjaxParameters( oSettings );
-				_fnServerParams( oSettings, aoData );
-				
-				oSettings.fnServerData.call( oSettings.oInstance, oSettings.sAjaxSource, aoData,
-					function(json) {
-						_fnAjaxUpdateDraw( oSettings, json );
-					}, oSettings );
-				return false;
-			}
-			else
-			{
-				return true;
-			}
-		}
-		
-		
-		/**
-		 * Build up the parameters in an object needed for a server-side processing request
-		 *  @param {object} oSettings dataTables settings object
-		 *  @returns {bool} block the table drawing or not
-		 *  @private
-		 */
-		function _fnAjaxParameters( oSettings )
-		{
-			var iColumns = oSettings.aoColumns.length;
-			var aoData = [], mDataProp;
-			var i;
-			
-			aoData.push( { "name": "sEcho",          "value": oSettings.iDraw } );
-			aoData.push( { "name": "iColumns",       "value": iColumns } );
-			aoData.push( { "name": "sColumns",       "value": _fnColumnOrdering(oSettings) } );
-			aoData.push( { "name": "iDisplayStart",  "value": oSettings._iDisplayStart } );
-			aoData.push( { "name": "iDisplayLength", "value": oSettings.oFeatures.bPaginate !== false ?
-				oSettings._iDisplayLength : -1 } );
-				
-			for ( i=0 ; i<iColumns ; i++ )
-			{
-			  mDataProp = oSettings.aoColumns[i].mDataProp;
-				aoData.push( { "name": "mDataProp_"+i, "value": typeof(mDataProp)=="function" ? 'function' : mDataProp } );
-			}
-			
-			/* Filtering */
-			if ( oSettings.oFeatures.bFilter !== false )
-			{
-				aoData.push( { "name": "sSearch", "value": oSettings.oPreviousSearch.sSearch } );
-				aoData.push( { "name": "bRegex",  "value": oSettings.oPreviousSearch.bRegex } );
-				for ( i=0 ; i<iColumns ; i++ )
-				{
-					aoData.push( { "name": "sSearch_"+i,     "value": oSettings.aoPreSearchCols[i].sSearch } );
-					aoData.push( { "name": "bRegex_"+i,      "value": oSettings.aoPreSearchCols[i].bRegex } );
-					aoData.push( { "name": "bSearchable_"+i, "value": oSettings.aoColumns[i].bSearchable } );
-				}
-			}
-			
-			/* Sorting */
-			if ( oSettings.oFeatures.bSort !== false )
-			{
-				var iFixed = oSettings.aaSortingFixed !== null ? oSettings.aaSortingFixed.length : 0;
-				var iUser = oSettings.aaSorting.length;
-				aoData.push( { "name": "iSortingCols",   "value": iFixed+iUser } );
-				for ( i=0 ; i<iFixed ; i++ )
-				{
-					aoData.push( { "name": "iSortCol_"+i,  "value": oSettings.aaSortingFixed[i][0] } );
-					aoData.push( { "name": "sSortDir_"+i,  "value": oSettings.aaSortingFixed[i][1] } );
-				}
-				
-				for ( i=0 ; i<iUser ; i++ )
-				{
-					aoData.push( { "name": "iSortCol_"+(i+iFixed),  "value": oSettings.aaSorting[i][0] } );
-					aoData.push( { "name": "sSortDir_"+(i+iFixed),  "value": oSettings.aaSorting[i][1] } );
-				}
-				
-				for ( i=0 ; i<iColumns ; i++ )
-				{
-					aoData.push( { "name": "bSortable_"+i,  "value": oSettings.aoColumns[i].bSortable } );
-				}
-			}
-			
-			return aoData;
-		}
-		
-		
-		/**
-		 * Add Ajax parameters from plugins
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param array {objects} aoData name/value pairs to send to the server
-		 *  @private
-		 */
-		function _fnServerParams( oSettings, aoData )
-		{
-			for ( var i=0, iLen=oSettings.aoServerParams.length ; i<iLen ; i++ )
-			{
-				oSettings.aoServerParams[i].fn.call( oSettings.oInstance, aoData );
-			}
-		}
-		
-		
-		/**
-		 * Data the data from the server (nuking the old) and redraw the table
-		 *  @param {object} oSettings dataTables settings object
-		 *  @param {object} json json data return from the server.
-		 *  @param {string} json.sEcho Tracking flag for DataTables to match requests
-		 *  @param {int} json.iTotalRecords Number of records in the data set, not accounting for filtering
-		 *  @param {int} json.iTotalDisplayRecords Number of records in the data set, accounting for filtering
-		 *  @param {array} json.aaData The data to display on this page
-		 *  @param {string} [json.sColumns] Column ordering (sName, comma separated)
-		 *  @private
-		 */
-		function _fnAjaxUpdateDraw ( oSettings, json )
-		{
-			if ( typeof json.sEcho != 'undefined' )
-			{
-				/* Protect against old returns over-writing a new one. Possible when you get
-				 * very fast interaction, and later queires are completed much faster
-				 */
-				if ( json.sEcho*1 < oSettings.iDraw )
-				{
-					return;
-				}
-				else
-				{
-					oSettings.iDraw = json.sEcho * 1;
-				}
-			}
-			
-			if ( !oSettings.oScroll.bInfinite ||
-				   (oSettings.oScroll.bInfinite && (oSettings.bSorted || oSettings.bFiltered)) )
-			{
-				_fnClearTable( oSettings );
-			}
-			oSettings._iRecordsTotal = parseInt(json.iTotalRecords, 10);
-			oSettings._iRecordsDisplay = parseInt(json.iTotalDisplayRecords, 10);
-			
-			/* Determine if reordering is required */
-			var sOrdering = _fnColumnOrdering(oSettings);
-			var bReOrder = (typeof json.sColumns != 'undefined' && sOrdering !== "" && json.sColumns != sOrdering );
-			if ( bReOrder )
-			{
-				var aiIndex = _fnReOrderIndex( oSettings, json.sColumns );
-			}
-			
-			var aData = _fnGetObjectDataFn( oSettings.sAjaxDataProp )( json );
-			for ( var i=0, iLen=aData.length ; i<iLen ; i++ )
-			{
-				if ( bReOrder )
-				{
-					/* If we need to re-order, then create a new array with the correct order and add it */
-					var aDataSorted = [];
-					for ( var j=0, jLen=oSettings.aoColumns.length ; j<jLen ; j++ )
-					{
-						aDataSorted.push( aData[i][ aiIndex[j] ] );
-					}
-					_fnAddData( oSettings, aDataSorted );
-				}
-				else
-				{
-					/* No re-order required, sever got it "right" - just straight add */
-					_fnAddData( oSettings, aData[i] );
-				}
-			}
-			oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
-			
-			oSettings.bAjaxDataGet = false;
-			_fnDraw( oSettings );
-			oSettings.bAjaxDataGet = true;
-			_fnProcessingDisplay( oSettings, false );
-		}
-		
-		
 		/**
 		 * Add the options to the page HTML for the table
 		 *  @param {object} oSettings dataTables settings object
@@ -1976,6 +1794,189 @@
 		
 		
 		
+		/**
+		 * Update the table using an Ajax call
+		 *  @param {object} oSettings dataTables settings object
+		 *  @returns {boolean} Block the table drawing or not
+		 *  @private
+		 */
+		function _fnAjaxUpdate( oSettings )
+		{
+			if ( oSettings.bAjaxDataGet )
+			{
+				oSettings.iDraw++;
+				_fnProcessingDisplay( oSettings, true );
+				var iColumns = oSettings.aoColumns.length;
+				var aoData = _fnAjaxParameters( oSettings );
+				_fnServerParams( oSettings, aoData );
+				
+				oSettings.fnServerData.call( oSettings.oInstance, oSettings.sAjaxSource, aoData,
+					function(json) {
+						_fnAjaxUpdateDraw( oSettings, json );
+					}, oSettings );
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+		
+		
+		/**
+		 * Build up the parameters in an object needed for a server-side processing request
+		 *  @param {object} oSettings dataTables settings object
+		 *  @returns {bool} block the table drawing or not
+		 *  @private
+		 */
+		function _fnAjaxParameters( oSettings )
+		{
+			var iColumns = oSettings.aoColumns.length;
+			var aoData = [], mDataProp;
+			var i;
+			
+			aoData.push( { "name": "sEcho",          "value": oSettings.iDraw } );
+			aoData.push( { "name": "iColumns",       "value": iColumns } );
+			aoData.push( { "name": "sColumns",       "value": _fnColumnOrdering(oSettings) } );
+			aoData.push( { "name": "iDisplayStart",  "value": oSettings._iDisplayStart } );
+			aoData.push( { "name": "iDisplayLength", "value": oSettings.oFeatures.bPaginate !== false ?
+				oSettings._iDisplayLength : -1 } );
+				
+			for ( i=0 ; i<iColumns ; i++ )
+			{
+			  mDataProp = oSettings.aoColumns[i].mDataProp;
+				aoData.push( { "name": "mDataProp_"+i, "value": typeof(mDataProp)=="function" ? 'function' : mDataProp } );
+			}
+			
+			/* Filtering */
+			if ( oSettings.oFeatures.bFilter !== false )
+			{
+				aoData.push( { "name": "sSearch", "value": oSettings.oPreviousSearch.sSearch } );
+				aoData.push( { "name": "bRegex",  "value": oSettings.oPreviousSearch.bRegex } );
+				for ( i=0 ; i<iColumns ; i++ )
+				{
+					aoData.push( { "name": "sSearch_"+i,     "value": oSettings.aoPreSearchCols[i].sSearch } );
+					aoData.push( { "name": "bRegex_"+i,      "value": oSettings.aoPreSearchCols[i].bRegex } );
+					aoData.push( { "name": "bSearchable_"+i, "value": oSettings.aoColumns[i].bSearchable } );
+				}
+			}
+			
+			/* Sorting */
+			if ( oSettings.oFeatures.bSort !== false )
+			{
+				var iFixed = oSettings.aaSortingFixed !== null ? oSettings.aaSortingFixed.length : 0;
+				var iUser = oSettings.aaSorting.length;
+				aoData.push( { "name": "iSortingCols",   "value": iFixed+iUser } );
+				for ( i=0 ; i<iFixed ; i++ )
+				{
+					aoData.push( { "name": "iSortCol_"+i,  "value": oSettings.aaSortingFixed[i][0] } );
+					aoData.push( { "name": "sSortDir_"+i,  "value": oSettings.aaSortingFixed[i][1] } );
+				}
+				
+				for ( i=0 ; i<iUser ; i++ )
+				{
+					aoData.push( { "name": "iSortCol_"+(i+iFixed),  "value": oSettings.aaSorting[i][0] } );
+					aoData.push( { "name": "sSortDir_"+(i+iFixed),  "value": oSettings.aaSorting[i][1] } );
+				}
+				
+				for ( i=0 ; i<iColumns ; i++ )
+				{
+					aoData.push( { "name": "bSortable_"+i,  "value": oSettings.aoColumns[i].bSortable } );
+				}
+			}
+			
+			return aoData;
+		}
+		
+		
+		/**
+		 * Add Ajax parameters from plugins
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param array {objects} aoData name/value pairs to send to the server
+		 *  @private
+		 */
+		function _fnServerParams( oSettings, aoData )
+		{
+			for ( var i=0, iLen=oSettings.aoServerParams.length ; i<iLen ; i++ )
+			{
+				oSettings.aoServerParams[i].fn.call( oSettings.oInstance, aoData );
+			}
+		}
+		
+		
+		/**
+		 * Data the data from the server (nuking the old) and redraw the table
+		 *  @param {object} oSettings dataTables settings object
+		 *  @param {object} json json data return from the server.
+		 *  @param {string} json.sEcho Tracking flag for DataTables to match requests
+		 *  @param {int} json.iTotalRecords Number of records in the data set, not accounting for filtering
+		 *  @param {int} json.iTotalDisplayRecords Number of records in the data set, accounting for filtering
+		 *  @param {array} json.aaData The data to display on this page
+		 *  @param {string} [json.sColumns] Column ordering (sName, comma separated)
+		 *  @private
+		 */
+		function _fnAjaxUpdateDraw ( oSettings, json )
+		{
+			if ( typeof json.sEcho != 'undefined' )
+			{
+				/* Protect against old returns over-writing a new one. Possible when you get
+				 * very fast interaction, and later queires are completed much faster
+				 */
+				if ( json.sEcho*1 < oSettings.iDraw )
+				{
+					return;
+				}
+				else
+				{
+					oSettings.iDraw = json.sEcho * 1;
+				}
+			}
+			
+			if ( !oSettings.oScroll.bInfinite ||
+				   (oSettings.oScroll.bInfinite && (oSettings.bSorted || oSettings.bFiltered)) )
+			{
+				_fnClearTable( oSettings );
+			}
+			oSettings._iRecordsTotal = parseInt(json.iTotalRecords, 10);
+			oSettings._iRecordsDisplay = parseInt(json.iTotalDisplayRecords, 10);
+			
+			/* Determine if reordering is required */
+			var sOrdering = _fnColumnOrdering(oSettings);
+			var bReOrder = (typeof json.sColumns != 'undefined' && sOrdering !== "" && json.sColumns != sOrdering );
+			if ( bReOrder )
+			{
+				var aiIndex = _fnReOrderIndex( oSettings, json.sColumns );
+			}
+			
+			var aData = _fnGetObjectDataFn( oSettings.sAjaxDataProp )( json );
+			for ( var i=0, iLen=aData.length ; i<iLen ; i++ )
+			{
+				if ( bReOrder )
+				{
+					/* If we need to re-order, then create a new array with the correct order and add it */
+					var aDataSorted = [];
+					for ( var j=0, jLen=oSettings.aoColumns.length ; j<jLen ; j++ )
+					{
+						aDataSorted.push( aData[i][ aiIndex[j] ] );
+					}
+					_fnAddData( oSettings, aDataSorted );
+				}
+				else
+				{
+					/* No re-order required, sever got it "right" - just straight add */
+					_fnAddData( oSettings, aData[i] );
+				}
+			}
+			oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
+			
+			oSettings.bAjaxDataGet = false;
+			_fnDraw( oSettings );
+			oSettings.bAjaxDataGet = true;
+			_fnProcessingDisplay( oSettings, false );
+		}
+		
+		
+		
 		/**
 		 * Generate the node required for filtering text
 		 *  @returns {node} Filter control element
diff --git a/media/src/DataTables.js b/media/src/DataTables.js
index 5ca6cc36..76ce051b 100644
--- a/media/src/DataTables.js
+++ b/media/src/DataTables.js
@@ -61,6 +61,7 @@
 		require('core.columns.js');
 		require('core.data.js');
 		require('core.draw.js');
+		require('core.ajax.js');
 		require('core.filter.js');
 		require('core.info.js');
 		require('core.init.js');
diff --git a/media/src/core/core.draw.js b/media/src/core/core.draw.js
index 2f29865b..1cf01606 100644
--- a/media/src/core/core.draw.js
+++ b/media/src/core/core.draw.js
@@ -550,188 +550,6 @@ function _fnReDraw( oSettings )
 }
 
 
-/**
- * Update the table using an Ajax call
- *  @param {object} oSettings dataTables settings object
- *  @returns {boolean} Block the table drawing or not
- *  @private
- */
-function _fnAjaxUpdate( oSettings )
-{
-	if ( oSettings.bAjaxDataGet )
-	{
-		oSettings.iDraw++;
-		_fnProcessingDisplay( oSettings, true );
-		var iColumns = oSettings.aoColumns.length;
-		var aoData = _fnAjaxParameters( oSettings );
-		_fnServerParams( oSettings, aoData );
-		
-		oSettings.fnServerData.call( oSettings.oInstance, oSettings.sAjaxSource, aoData,
-			function(json) {
-				_fnAjaxUpdateDraw( oSettings, json );
-			}, oSettings );
-		return false;
-	}
-	else
-	{
-		return true;
-	}
-}
-
-
-/**
- * Build up the parameters in an object needed for a server-side processing request
- *  @param {object} oSettings dataTables settings object
- *  @returns {bool} block the table drawing or not
- *  @private
- */
-function _fnAjaxParameters( oSettings )
-{
-	var iColumns = oSettings.aoColumns.length;
-	var aoData = [], mDataProp;
-	var i;
-	
-	aoData.push( { "name": "sEcho",          "value": oSettings.iDraw } );
-	aoData.push( { "name": "iColumns",       "value": iColumns } );
-	aoData.push( { "name": "sColumns",       "value": _fnColumnOrdering(oSettings) } );
-	aoData.push( { "name": "iDisplayStart",  "value": oSettings._iDisplayStart } );
-	aoData.push( { "name": "iDisplayLength", "value": oSettings.oFeatures.bPaginate !== false ?
-		oSettings._iDisplayLength : -1 } );
-		
-	for ( i=0 ; i<iColumns ; i++ )
-	{
-	  mDataProp = oSettings.aoColumns[i].mDataProp;
-		aoData.push( { "name": "mDataProp_"+i, "value": typeof(mDataProp)=="function" ? 'function' : mDataProp } );
-	}
-	
-	/* Filtering */
-	if ( oSettings.oFeatures.bFilter !== false )
-	{
-		aoData.push( { "name": "sSearch", "value": oSettings.oPreviousSearch.sSearch } );
-		aoData.push( { "name": "bRegex",  "value": oSettings.oPreviousSearch.bRegex } );
-		for ( i=0 ; i<iColumns ; i++ )
-		{
-			aoData.push( { "name": "sSearch_"+i,     "value": oSettings.aoPreSearchCols[i].sSearch } );
-			aoData.push( { "name": "bRegex_"+i,      "value": oSettings.aoPreSearchCols[i].bRegex } );
-			aoData.push( { "name": "bSearchable_"+i, "value": oSettings.aoColumns[i].bSearchable } );
-		}
-	}
-	
-	/* Sorting */
-	if ( oSettings.oFeatures.bSort !== false )
-	{
-		var iFixed = oSettings.aaSortingFixed !== null ? oSettings.aaSortingFixed.length : 0;
-		var iUser = oSettings.aaSorting.length;
-		aoData.push( { "name": "iSortingCols",   "value": iFixed+iUser } );
-		for ( i=0 ; i<iFixed ; i++ )
-		{
-			aoData.push( { "name": "iSortCol_"+i,  "value": oSettings.aaSortingFixed[i][0] } );
-			aoData.push( { "name": "sSortDir_"+i,  "value": oSettings.aaSortingFixed[i][1] } );
-		}
-		
-		for ( i=0 ; i<iUser ; i++ )
-		{
-			aoData.push( { "name": "iSortCol_"+(i+iFixed),  "value": oSettings.aaSorting[i][0] } );
-			aoData.push( { "name": "sSortDir_"+(i+iFixed),  "value": oSettings.aaSorting[i][1] } );
-		}
-		
-		for ( i=0 ; i<iColumns ; i++ )
-		{
-			aoData.push( { "name": "bSortable_"+i,  "value": oSettings.aoColumns[i].bSortable } );
-		}
-	}
-	
-	return aoData;
-}
-
-
-/**
- * Add Ajax parameters from plugins
- *  @param {object} oSettings dataTables settings object
- *  @param array {objects} aoData name/value pairs to send to the server
- *  @private
- */
-function _fnServerParams( oSettings, aoData )
-{
-	for ( var i=0, iLen=oSettings.aoServerParams.length ; i<iLen ; i++ )
-	{
-		oSettings.aoServerParams[i].fn.call( oSettings.oInstance, aoData );
-	}
-}
-
-
-/**
- * Data the data from the server (nuking the old) and redraw the table
- *  @param {object} oSettings dataTables settings object
- *  @param {object} json json data return from the server.
- *  @param {string} json.sEcho Tracking flag for DataTables to match requests
- *  @param {int} json.iTotalRecords Number of records in the data set, not accounting for filtering
- *  @param {int} json.iTotalDisplayRecords Number of records in the data set, accounting for filtering
- *  @param {array} json.aaData The data to display on this page
- *  @param {string} [json.sColumns] Column ordering (sName, comma separated)
- *  @private
- */
-function _fnAjaxUpdateDraw ( oSettings, json )
-{
-	if ( typeof json.sEcho != 'undefined' )
-	{
-		/* Protect against old returns over-writing a new one. Possible when you get
-		 * very fast interaction, and later queires are completed much faster
-		 */
-		if ( json.sEcho*1 < oSettings.iDraw )
-		{
-			return;
-		}
-		else
-		{
-			oSettings.iDraw = json.sEcho * 1;
-		}
-	}
-	
-	if ( !oSettings.oScroll.bInfinite ||
-		   (oSettings.oScroll.bInfinite && (oSettings.bSorted || oSettings.bFiltered)) )
-	{
-		_fnClearTable( oSettings );
-	}
-	oSettings._iRecordsTotal = parseInt(json.iTotalRecords, 10);
-	oSettings._iRecordsDisplay = parseInt(json.iTotalDisplayRecords, 10);
-	
-	/* Determine if reordering is required */
-	var sOrdering = _fnColumnOrdering(oSettings);
-	var bReOrder = (typeof json.sColumns != 'undefined' && sOrdering !== "" && json.sColumns != sOrdering );
-	if ( bReOrder )
-	{
-		var aiIndex = _fnReOrderIndex( oSettings, json.sColumns );
-	}
-	
-	var aData = _fnGetObjectDataFn( oSettings.sAjaxDataProp )( json );
-	for ( var i=0, iLen=aData.length ; i<iLen ; i++ )
-	{
-		if ( bReOrder )
-		{
-			/* If we need to re-order, then create a new array with the correct order and add it */
-			var aDataSorted = [];
-			for ( var j=0, jLen=oSettings.aoColumns.length ; j<jLen ; j++ )
-			{
-				aDataSorted.push( aData[i][ aiIndex[j] ] );
-			}
-			_fnAddData( oSettings, aDataSorted );
-		}
-		else
-		{
-			/* No re-order required, sever got it "right" - just straight add */
-			_fnAddData( oSettings, aData[i] );
-		}
-	}
-	oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
-	
-	oSettings.bAjaxDataGet = false;
-	_fnDraw( oSettings );
-	oSettings.bAjaxDataGet = true;
-	_fnProcessingDisplay( oSettings, false );
-}
-
-
 /**
  * Add the options to the page HTML for the table
  *  @param {object} oSettings dataTables settings object