1be97b106ca9b87308ca4fba2e8d8abf795c9213 dev: Stop calling save state…

… when loading a state

Jira Issue DD-2301

01d171892df647431a6f7e6d3acc13e29a46ed0d dev: More resetting of flags from previous commit

Jira Issue DD-2301

Sync to source repo @01d171892df647431a6f7e6d3acc13e29a46ed0d

datatables.json

@@ -9,5 +9,5 @@
     ],
     "src-repo": "http://github.com/DataTables/DataTablesSrc",
     "last-tag": "1.11.2",
-    "last-sync": "1eddf57e55486c9e69581f14f77a2c3cd58b43f4"
+    "last-sync": "01d171892df647431a6f7e6d3acc13e29a46ed0d"
 }

js/jquery.dataTables.js

@@ -6382,6 +6382,11 @@
 	 */
 	function _fnSaveState ( settings )
 	{
+		if (settings._bLoadingState) {
+			console.log(settings._bLoadingState)
+			return;
+		}
+
 		/* Store the interesting variables */
 		var state = {
 			time:    +new Date(),
@@ -6438,12 +6443,14 @@
 	function _fnImplementState ( settings, s, callback) {
 		var i, ien;
 		var columns = settings.aoColumns;
+		settings._bLoadingState = true;
 
 		// When StateRestore was introduced the state could now be implemented at any time
 		// Not just initialisation. To do this an api instance is required in some places
 		var api = settings._bInitComplete ? new DataTable.Api(settings) : null;
 
 		if ( ! s || ! s.time ) {
+			settings._bLoadingState = false;
 			callback();
 			return;
 		}
@@ -6452,19 +6459,22 @@
 		// cancelling of loading by returning false
 		var abStateLoad = _fnCallbackFire( settings, 'aoStateLoadParams', 'stateLoadParams', [settings, s] );
 		if ( $.inArray( false, abStateLoad ) !== -1 ) {
+			settings._bLoadingState = false;
 			callback();
 			return;
 		}
 
 		// Reject old data
 		var duration = settings.iStateDuration;
 		if ( duration > 0 && s.time < +new Date() - (duration*1000) ) {
+			settings._bLoadingState = false;
 			callback();
 			return;
 		}
 
 		// Number of columns have changed - all bets are off, no restore of settings
 		if ( s.columns && columns.length !== s.columns.length ) {
+			settings._bLoadingState = false;
 			callback();
 			return;
 		}
@@ -6529,6 +6539,7 @@
 			}
 		}
 
+		settings._bLoadingState = false;
 		_fnCallbackFire( settings, 'aoStateLoaded', 'stateLoaded', [settings, s] );
 		callback();
 	};