4d239c02420f0e9df78cae7c332e11ba88292b21 Fix: State saving wasn't res…

…toring paging when used with Ajax

https://datatables.net/forums/discussion/79485/

Sync to source repo @4d239c02420f0e9df78cae7c332e11ba88292b21

datatables.json

@@ -11,5 +11,5 @@
     ],
     "src-repo": "http://github.com/DataTables/DataTablesSrc",
     "last-tag": "2.1.2",
-    "last-sync": "bea426bb6edb7a31ef8d2a7cd1bae218388a7293"
+    "last-sync": "4d239c02420f0e9df78cae7c332e11ba88292b21"
 }

js/dataTables.js

@@ -4731,7 +4731,7 @@
 	 */
 	function _fnInitialise ( settings )
 	{
-		var i, iAjaxStart=settings.iInitDisplayStart;
+		var i;
 		var init = settings.oInit;
 		var deferLoading = settings.deferLoading;
 		var dataSrc = _fnDataSource( settings );
@@ -4752,6 +4752,9 @@
 			_fnDrawHead( settings, settings.aoHeader );
 			_fnDrawHead( settings, settings.aoFooter );
 
+			// Cache the paging start point, as the first redraw will reset it
+			var iAjaxStart = settings.iInitDisplayStart
+
 			// Local data load
 			// Check if there is data passing into the constructor
 			if ( init.aaData ) {
@@ -6222,8 +6225,7 @@
 			}
 		}
 
-		// Restore key features - todo - for 1.11 this needs to be done by
-		// subscribed events
+		// Restore key features
 		if ( s.start !== undefined ) {
 			if(api === null) {
 				settings._iDisplayStart    = s.start;

js/dataTables.mjs

@@ -4678,7 +4678,7 @@ function _fnFilterData ( settings )
  */
 function _fnInitialise ( settings )
 {
-	var i, iAjaxStart=settings.iInitDisplayStart;
+	var i;
 	var init = settings.oInit;
 	var deferLoading = settings.deferLoading;
 	var dataSrc = _fnDataSource( settings );
@@ -4699,6 +4699,9 @@ function _fnInitialise ( settings )
 		_fnDrawHead( settings, settings.aoHeader );
 		_fnDrawHead( settings, settings.aoFooter );
 
+		// Cache the paging start point, as the first redraw will reset it
+		var iAjaxStart = settings.iInitDisplayStart
+
 		// Local data load
 		// Check if there is data passing into the constructor
 		if ( init.aaData ) {
@@ -6169,8 +6172,7 @@ function _fnImplementState ( settings, s, callback) {
 		}
 	}
 
-	// Restore key features - todo - for 1.11 this needs to be done by
-	// subscribed events
+	// Restore key features
 	if ( s.start !== undefined ) {
 		if(api === null) {
 			settings._iDisplayStart    = s.start;