datatables.net 2.0.7 → 2.1.0

package/js/dataTables.mjs

@@ -1,4 +1,4 @@
-/*! DataTables 2.0.7
+/*! DataTables 2.1.0
  * © SpryMedia Ltd - datatables.net/license
  */
 
@@ -51,7 +51,6 @@ var DataTable = function ( selector, options )
 		
 		var i=0, iLen;
 		var sId = this.getAttribute( 'id' );
-		var bInitHandedOff = false;
 		var defaults = DataTable.defaults;
 		var $this = $(this);
 		
@@ -201,6 +200,7 @@ var DataTable = function ( selector, options )
 			"rowId",
 			"caption",
 			"layout",
+			"orderDescReverse",
 			[ "iCookieDuration", "iStateDuration" ], // backwards compat
 			[ "oSearch", "oPreviousSearch" ],
 			[ "aoSearchCols", "aoPreSearchCols" ],
@@ -247,38 +247,14 @@ var DataTable = function ( selector, options )
 			oSettings._iDisplayStart = oInit.iDisplayStart;
 		}
 		
-		/* Language definitions */
-		var oLanguage = oSettings.oLanguage;
-		$.extend( true, oLanguage, oInit.oLanguage );
-		
-		if ( oLanguage.sUrl )
+		var defer = oInit.iDeferLoading;
+		if ( defer !== null )
 		{
-			/* Get the language definitions from a file - because this Ajax call makes the language
-			 * get async to the remainder of this function we use bInitHandedOff to indicate that
-			 * _fnInitialise will be fired by the returned Ajax handler, rather than the constructor
-			 */
-			$.ajax( {
-				dataType: 'json',
-				url: oLanguage.sUrl,
-				success: function ( json ) {
-					_fnCamelToHungarian( defaults.oLanguage, json );
-					$.extend( true, oLanguage, json, oSettings.oInit.oLanguage );
+			oSettings.deferLoading = true;
 		
-					_fnCallbackFire( oSettings, null, 'i18n', [oSettings], true);
-					_fnInitialise( oSettings );
-				},
-				error: function () {
-					// Error occurred loading language file
-					_fnLog( oSettings, 0, 'i18n file loading error', 21 );
-		
-					// continue on as best we can
-					_fnInitialise( oSettings );
-				}
-			} );
-			bInitHandedOff = true;
-		}
-		else {
-			_fnCallbackFire( oSettings, null, 'i18n', [oSettings]);
+			var tmp = Array.isArray(defer);
+			oSettings._iRecordsDisplay = tmp ? defer[0] : defer;
+			oSettings._iRecordsTotal = tmp ? defer[1] : defer;
 		}
 		
 		/*
@@ -345,113 +321,112 @@ var DataTable = function ( selector, options )
 			} );
 		}
 		
+		// Must be done after everything which can be overridden by the state saving!
+		_fnCallbackReg( oSettings, 'aoDrawCallback', _fnSaveState );
+		
 		var features = oSettings.oFeatures;
-		var loadedInit = function () {
-			/*
-			 * Sorting
-			 * @todo For modularisation (1.11) this needs to do into a sort start up handler
-			 */
+		if ( oInit.bStateSave )
+		{
+			features.bStateSave = true;
+		}
 		
-			// If aaSorting is not defined, then we use the first indicator in asSorting
-			// in case that has been altered, so the default sort reflects that option
-			if ( oInit.aaSorting === undefined ) {
-				var sorting = oSettings.aaSorting;
-				for ( i=0, iLen=sorting.length ; i<iLen ; i++ ) {
-					sorting[i][1] = oSettings.aoColumns[ i ].asSorting[0];
-				}
+		// If aaSorting is not defined, then we use the first indicator in asSorting
+		// in case that has been altered, so the default sort reflects that option
+		if ( oInit.aaSorting === undefined ) {
+			var sorting = oSettings.aaSorting;
+			for ( i=0, iLen=sorting.length ; i<iLen ; i++ ) {
+				sorting[i][1] = oSettings.aoColumns[ i ].asSorting[0];
 			}
+		}
 		
-			/* Do a first pass on the sorting classes (allows any size changes to be taken into
-			 * account, and also will apply sorting disabled classes if disabled
-			 */
-			_fnSortingClasses( oSettings );
-		
-			_fnCallbackReg( oSettings, 'aoDrawCallback', function () {
-				if ( oSettings.bSorted || _fnDataSource( oSettings ) === 'ssp' || features.bDeferRender ) {
-					_fnSortingClasses( oSettings );
-				}
-			} );
+		// Do a first pass on the sorting classes (allows any size changes to be taken into
+		// account, and also will apply sorting disabled classes if disabled
+		_fnSortingClasses( oSettings );
 		
+		_fnCallbackReg( oSettings, 'aoDrawCallback', function () {
+			if ( oSettings.bSorted || _fnDataSource( oSettings ) === 'ssp' || features.bDeferRender ) {
+				_fnSortingClasses( oSettings );
+			}
+		} );
 		
-			/*
-			 * Final init
-			 * Cache the header, body and footer as required, creating them if needed
-			 */
-			var caption = $this.children('caption');
 		
-			if ( oSettings.caption ) {
-				if ( caption.length === 0 ) {
-					caption = $('<caption/>').appendTo( $this );
-				}
+		/*
+		 * Table HTML init
+		 * Cache the header, body and footer as required, creating them if needed
+		 */
+		var caption = $this.children('caption');
 		
-				caption.html( oSettings.caption );
+		if ( oSettings.caption ) {
+			if ( caption.length === 0 ) {
+				caption = $('<caption/>').appendTo( $this );
 			}
 		
-			// Store the caption side, so we can remove the element from the document
-			// when creating the element
-			if (caption.length) {
-				caption[0]._captionSide = caption.css('caption-side');
-				oSettings.captionNode = caption[0];
-			}
+			caption.html( oSettings.caption );
+		}
 		
-			if ( thead.length === 0 ) {
-				thead = $('<thead/>').appendTo($this);
-			}
-			oSettings.nTHead = thead[0];
-			$('tr', thead).addClass(oClasses.thead.row);
+		// Store the caption side, so we can remove the element from the document
+		// when creating the element
+		if (caption.length) {
+			caption[0]._captionSide = caption.css('caption-side');
+			oSettings.captionNode = caption[0];
+		}
 		
-			var tbody = $this.children('tbody');
-			if ( tbody.length === 0 ) {
-				tbody = $('<tbody/>').insertAfter(thead);
-			}
-			oSettings.nTBody = tbody[0];
+		if ( thead.length === 0 ) {
+			thead = $('<thead/>').appendTo($this);
+		}
+		oSettings.nTHead = thead[0];
+		$('tr', thead).addClass(oClasses.thead.row);
 		
-			var tfoot = $this.children('tfoot');
-			if ( tfoot.length === 0 ) {
-				// If we are a scrolling table, and no footer has been given, then we need to create
-				// a tfoot element for the caption element to be appended to
-				tfoot = $('<tfoot/>').appendTo($this);
-			}
-			oSettings.nTFoot = tfoot[0];
-			$('tr', tfoot).addClass(oClasses.tfoot.row);
+		var tbody = $this.children('tbody');
+		if ( tbody.length === 0 ) {
+			tbody = $('<tbody/>').insertAfter(thead);
+		}
+		oSettings.nTBody = tbody[0];
 		
-			// Check if there is data passing into the constructor
-			if ( oInit.aaData ) {
-				for ( i=0 ; i<oInit.aaData.length ; i++ ) {
-					_fnAddData( oSettings, oInit.aaData[ i ] );
-				}
-			}
-			else if ( _fnDataSource( oSettings ) == 'dom' ) {
-				// Grab the data from the page
-				_fnAddTr( oSettings, $(oSettings.nTBody).children('tr') );
-			}
+		var tfoot = $this.children('tfoot');
+		if ( tfoot.length === 0 ) {
+			// If we are a scrolling table, and no footer has been given, then we need to create
+			// a tfoot element for the caption element to be appended to
+			tfoot = $('<tfoot/>').appendTo($this);
+		}
+		oSettings.nTFoot = tfoot[0];
+		$('tr', tfoot).addClass(oClasses.tfoot.row);
 		
-			/* Copy the data index array */
-			oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
+		// Copy the data index array
+		oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
 		
-			/* Initialisation complete - table can be drawn */
-			oSettings.bInitialised = true;
+		// Initialisation complete - table can be drawn
+		oSettings.bInitialised = true;
 		
-			/* Check if we need to initialise the table (it might not have been handed off to the
-			 * language processor)
-			 */
-			if ( bInitHandedOff === false ) {
-				_fnInitialise( oSettings );
-			}
-		};
+		// Language definitions
+		var oLanguage = oSettings.oLanguage;
+		$.extend( true, oLanguage, oInit.oLanguage );
 		
-		/* Must be done after everything which can be overridden by the state saving! */
-		_fnCallbackReg( oSettings, 'aoDrawCallback', _fnSaveState );
+		if ( oLanguage.sUrl ) {
+			// Get the language definitions from a file
+			$.ajax( {
+				dataType: 'json',
+				url: oLanguage.sUrl,
+				success: function ( json ) {
+					_fnCamelToHungarian( defaults.oLanguage, json );
+					$.extend( true, oLanguage, json, oSettings.oInit.oLanguage );
 		
-		if ( oInit.bStateSave )
-		{
-			features.bStateSave = true;
-			_fnLoadState( oSettings, oInit, loadedInit );
+					_fnCallbackFire( oSettings, null, 'i18n', [oSettings], true);
+					_fnInitialise( oSettings );
+				},
+				error: function () {
+					// Error occurred loading language file
+					_fnLog( oSettings, 0, 'i18n file loading error', 21 );
+		
+					// Continue on as best we can
+					_fnInitialise( oSettings );
+				}
+			} );
 		}
 		else {
-			loadedInit();
+			_fnCallbackFire( oSettings, null, 'i18n', [oSettings]);
+			_fnInitialise( oSettings );
 		}
-		
 	} );
 	_that = null;
 	return this;
@@ -968,6 +943,15 @@ $.extend( DataTable.ext.classes, {
 	info: {
 		container: 'dt-info'
 	},
+	layout: {
+		row: 'dt-layout-row',
+		cell: 'dt-layout-cell',
+		tableRow: 'dt-layout-table',
+		tableCell: '',
+		start: 'dt-layout-start',
+		end: 'dt-layout-end',
+		full: 'dt-layout-full'
+	},
 	length: {
 		container: 'dt-length',
 		select: 'dt-input'
@@ -1091,7 +1075,7 @@ var _numToDecimal = function ( num, decimalPoint ) {
 };
 
 
-var _isNumber = function ( d, decimalPoint, formatted ) {
+var _isNumber = function ( d, decimalPoint, formatted, allowEmpty ) {
 	var type = typeof d;
 	var strType = type === 'string';
 
@@ -1102,7 +1086,7 @@ var _isNumber = function ( d, decimalPoint, formatted ) {
 	// If empty return immediately so there must be a number if it is a
 	// formatted string (this stops the string "k", or "kr", etc being detected
 	// as a formatted number for currency
-	if ( _empty( d ) ) {
+	if ( allowEmpty && _empty( d ) ) {
 		return true;
 	}
 
@@ -1124,8 +1108,8 @@ var _isHtml = function ( d ) {
 };
 
 // Is a string a number surrounded by HTML?
-var _htmlNumeric = function ( d, decimalPoint, formatted ) {
-	if ( _empty( d ) ) {
+var _htmlNumeric = function ( d, decimalPoint, formatted, allowEmpty ) {
+	if ( allowEmpty && _empty( d ) ) {
 		return true;
 	}
 
@@ -1137,7 +1121,7 @@ var _htmlNumeric = function ( d, decimalPoint, formatted ) {
 	var html = _isHtml( d );
 	return ! html ?
 		null :
-		_isNumber( _stripHtml( d ), decimalPoint, formatted ) ?
+		_isNumber( _stripHtml( d ), decimalPoint, formatted, allowEmpty ) ?
 			true :
 			null;
 };
@@ -1233,6 +1217,10 @@ var _removeEmpty = function ( a )
 
 // Replaceable function in api.util
 var _stripHtml = function (input) {
+	if (! input) {
+		return input;
+	}
+
 	// Irrelevant check to workaround CodeQL's false positive on the regex
 	if (input.length > _max_str_len) {
 		throw new Error('Exceeded max str len');
@@ -2199,6 +2187,21 @@ function _fnGetColumns( oSettings, sParam )
 	return a;
 }
 
+/**
+ * Allow the result from a type detection function to be `true` while
+ * translating that into a string. Old type detection functions will
+ * return the type name if it passes. An obect store would be better,
+ * but not backwards compatible.
+ *
+ * @param {*} typeDetect Object or function for type detection
+ * @param {*} res Result from the type detection function
+ * @returns Type name or false
+ */
+function _typeResult (typeDetect, res) {
+	return res === true
+		? typeDetect.name
+		: res;
+}
 
 /**
  * Calculate the 'type' of a column
@@ -2213,7 +2216,13 @@ function _fnColumnTypes ( settings )
 	var i, ien, j, jen, k, ken;
 	var col, detectedType, cache;
 
-	// For each column, spin over the 
+	// If SSP then we don't have the full data set, so any type detection would be
+	// unreliable and error prone
+	if (_fnDataSource( settings ) === 'ssp') {
+		return;
+	}
+
+	// For each column, spin over the data type detection functions, seeing if one matches
 	for ( i=0, ien=columns.length ; i<ien ; i++ ) {
 		col = columns[i];
 		cache = [];
@@ -2223,8 +2232,27 @@ function _fnColumnTypes ( settings )
 		}
 		else if ( ! col.sType ) {
 			for ( j=0, jen=types.length ; j<jen ; j++ ) {
-				for ( k=0, ken=data.length ; k<ken ; k++ ) {
+				var typeDetect = types[j];
+
+				// There can be either one, or three type detection functions
+				var oneOf = typeDetect.oneOf;
+				var allOf = typeDetect.allOf || typeDetect;
+				var init = typeDetect.init;
+				var one = false;
+
+				detectedType = null;
+
+				// Fast detect based on column assignment
+				if (init) {
+					detectedType = _typeResult(typeDetect, init(settings, col, i));
+
+					if (detectedType) {
+						col.sType = detectedType;
+						break;
+					}
+				}
 
+				for ( k=0, ken=data.length ; k<ken ; k++ ) {
 					if (! data[k]) {
 						continue;
 					}
@@ -2235,14 +2263,20 @@ function _fnColumnTypes ( settings )
 						cache[k] = _fnGetCellData( settings, k, i, 'type' );
 					}
 
-					detectedType = types[j]( cache[k], settings );
+					// Only one data point in the column needs to match this function
+					if (oneOf && ! one) {
+						one = _typeResult(typeDetect, oneOf( cache[k], settings ));
+					}
+
+					// All data points need to match this function
+					detectedType = _typeResult(typeDetect, allOf( cache[k], settings ));
 
 					// If null, then this type can't apply to this column, so
 					// rather than testing all cells, break out. There is an
 					// exception for the last type which is `html`. We need to
 					// scan all rows since it is possible to mix string and HTML
 					// types
-					if ( ! detectedType && j !== types.length-2 ) {
+					if ( ! detectedType && j !== types.length-3 ) {
 						break;
 					}
 
@@ -2256,7 +2290,7 @@ function _fnColumnTypes ( settings )
 
 				// Type is valid for all data points in the column - use this
 				// type
-				if ( detectedType ) {
+				if ( (oneOf && one && detectedType) || (!oneOf && detectedType) ) {
 					col.sType = detectedType;
 					break;
 				}
@@ -2278,7 +2312,7 @@ function _fnColumnTypes ( settings )
 
 		var renderer = _ext.type.render[col.sType];
 
-		// This can only happen once! There is no way to remover
+		// This can only happen once! There is no way to remove
 		// a renderer. After the first time the renderer has
 		// already been set so createTr will run the renderer itself.
 		if (renderer && ! col._render) {
@@ -3322,7 +3356,13 @@ function _fnDraw( oSettings, ajaxComplete )
 	oSettings.bDrawing = true;
 
 	/* Server-side processing draw intercept */
-	if ( !bServerSide )
+	if ( oSettings.deferLoading )
+	{
+		oSettings.deferLoading = false;
+		oSettings.iDraw++;
+		_fnProcessingDisplay( oSettings, false );
+	}
+	else if ( !bServerSide )
 	{
 		oSettings.iDraw++;
 	}
@@ -3423,6 +3463,9 @@ function _fnReDraw( settings, holdPosition, recompute )
 		filter   = features.bFilter;
 
 	if (recompute === undefined || recompute === true) {
+		// Resolve any column types that are unknown due to addition or invalidation
+		_fnColumnTypes( settings );
+
 		if ( sort ) {
 			_fnSort( settings );
 		}
@@ -3478,113 +3521,154 @@ function _emptyRow ( settings ) {
 
 
 /**
- * Convert a `layout` object given by a user to the object structure needed
- * for the renderer. This is done twice, once for above and once for below
- * the table. Ordering must also be considered.
- *
- * @param {*} settings DataTables settings object
- * @param {*} layout Layout object to convert
- * @param {string} side `top` or `bottom`
- * @returns Converted array structure - one item for each row.
+ * Expand the layout items into an object for the rendering function
  */
-function _layoutArray ( settings, layout, side )
-{
-	var groups = {};
-
-	// Combine into like groups (e.g. `top`, `top2`, etc)
-	$.each( layout, function ( pos, val ) {
-		if (val === null) {
-			return;
+function _layoutItems (row, align, items) {
+	if ( Array.isArray(items)) {
+		for (var i=0 ; i<items.length ; i++) {
+			_layoutItems(row, align, items[i]);
 		}
 
-		var splitPos = pos.replace(/([A-Z])/g, ' $1').split(' ');
+		return;
+	}
 
-		if ( ! groups[ splitPos[0] ] ) {
-			groups[ splitPos[0] ] = {};
-		}
+	var rowCell = row[align];
 
-		var align = splitPos.length === 1 ?
-			'full' :
-			splitPos[1].toLowerCase();
-		var group = groups[ splitPos[0] ];
-		var groupRun = function (contents, innerVal) {
-			// If it is an object, then there can be multiple features contained in it
-			if ( $.isPlainObject( innerVal ) ) {
-				Object.keys(innerVal).map(function (key) {
-					contents.push( {
-						feature: key,
-						opts: innerVal[key]
-					});
-				});
+	// If it is an object, then there can be multiple features contained in it
+	if ( $.isPlainObject( items ) ) {
+		// A feature plugin cannot be named "features" due to this check
+		if (items.features) {
+			if (items.rowId) {
+				row.id = items.rowId;
 			}
-			else {
-				contents.push(innerVal);
+			if (items.rowClass) {
+				row.className = items.rowClass;
 			}
-		}
 
-		// Transform to an object with a contents property
-		if (! group[align] || ! group[align].contents) {
-			group[align] = { contents: [] };
+			rowCell.id = items.id;
+			rowCell.className = items.className;
+
+			_layoutItems(row, align, items.features);
+		}
+		else {
+			Object.keys(items).map(function (key) {
+				rowCell.contents.push( {
+					feature: key,
+					opts: items[key]
+				});
+			});
 		}
+	}
+	else {
+		rowCell.contents.push(items);
+	}
+}
+
+/**
+ * Find, or create a layout row
+ */
+function _layoutGetRow(rows, rowNum, align) {
+	var row;
+
+	// Find existing rows
+	for (var i=0; i<rows.length; i++) {
+		row = rows[i];
+
+		if (row.rowNum === rowNum) {
+			// full is on its own, but start and end share a row
+			if (
+				(align === 'full' && row.full) ||
+				((align === 'start' || align === 'end') && (row.start || row.end))
+			) {
+				if (! row[align]) {
+					row[align] = {
+						contents: []
+					};
+				}
 
-		// Allow for an array or just a single object
-		if ( Array.isArray(val)) {
-			for (var i=0 ; i<val.length ; i++) {
-				groupRun(group[align].contents, val[i]);
+				return row;
 			}
 		}
-		else {
-			groupRun(group[ align ].contents, val);
+	}
+
+	// If we get this far, then there was no match, create a new row
+	row = {
+		rowNum: rowNum	
+	};
+
+	row[align] = {
+		contents: []
+	};
+
+	rows.push(row);
+
+	return row;
+}
+
+/**
+ * Convert a `layout` object given by a user to the object structure needed
+ * for the renderer. This is done twice, once for above and once for below
+ * the table. Ordering must also be considered.
+ *
+ * @param {*} settings DataTables settings object
+ * @param {*} layout Layout object to convert
+ * @param {string} side `top` or `bottom`
+ * @returns Converted array structure - one item for each row.
+ */
+function _layoutArray ( settings, layout, side ) {
+	var rows = [];
+	
+	// Split out into an array
+	$.each( layout, function ( pos, items ) {
+		if (items === null) {
+			return;
 		}
 
-		// And make contents an array
-		if ( ! Array.isArray( group[ align ].contents ) ) {
-			group[ align ].contents = [ group[ align ].contents ];
+		var parts = pos.match(/^([a-z]+)([0-9]*)([A-Za-z]*)$/);
+		var rowNum = parts[2]
+			? parts[2] * 1
+			: 0;
+		var align = parts[3]
+			? parts[3].toLowerCase()
+			: 'full';
+
+		// Filter out the side we aren't interested in
+		if (parts[1] !== side) {
+			return;
 		}
-	} );
 
-	var filtered = Object.keys(groups)
-		.map( function ( pos ) {
-			// Filter to only the side we need
-			if ( pos.indexOf(side) !== 0 ) {
-				return null;
-			}
+		// Get or create the row we should attach to
+		var row = _layoutGetRow(rows, rowNum, align);
 
-			return {
-				name: pos,
-				val: groups[pos]
-			};
-		} )
-		.filter( function (item) {
-			return item !== null;
-		});
+		_layoutItems(row, align, items);
+	});
 
 	// Order by item identifier
-	filtered.sort( function ( a, b ) {
-		var order1 = a.name.replace(/[^0-9]/g, '') * 1;
-		var order2 = b.name.replace(/[^0-9]/g, '') * 1;
+	rows.sort( function ( a, b ) {
+		var order1 = a.rowNum;
+		var order2 = b.rowNum;
+
+		// If both in the same row, then the row with `full` comes first
+		if (order1 === order2) {
+			var ret = a.full && ! b.full ? -1 : 1;
+
+			return side === 'bottom'
+				? ret * -1
+				: ret;
+		}
 
 		return order2 - order1;
 	} );
-	
+
+	// Invert for below the table
 	if ( side === 'bottom' ) {
-		filtered.reverse();
+		rows.reverse();
 	}
 
-	// Split into rows
-	var rows = [];
-	for ( var i=0, ien=filtered.length ; i<ien ; i++ ) {
-		if (  filtered[i].val.full ) {
-			rows.push( { full: filtered[i].val.full } );
-			_layoutResolve( settings, rows[ rows.length - 1 ] );
-
-			delete filtered[i].val.full;
-		}
+	for (var row = 0; row<rows.length; row++) {
+		delete rows[row].rowNum;
 
-		if ( Object.keys(filtered[i].val).length ) {
-			rows.push( filtered[i].val );
-			_layoutResolve( settings, rows[ rows.length - 1 ] );
-		}
+		_layoutResolve(settings, rows[row]);
 	}
 
 	return rows;
@@ -3608,6 +3692,10 @@ function _layoutResolve( settings, row ) {
 	};
 
 	var resolve = function ( item ) {
+		if (! row[ item ]) {
+			return;
+		}
+
 		var line = row[ item ].contents;
 
 		for ( var i=0, ien=line.length ; i<ien ; i++ ) {
@@ -3635,9 +3723,9 @@ function _layoutResolve( settings, row ) {
 		}
 	};
 
-	$.each( row, function ( key ) {
-		resolve( key );
-	} );
+	resolve('start');
+	resolve('end');
+	resolve('full');
 }
 
 
@@ -3970,6 +4058,17 @@ function _fnBuildAjax( oSettings, data, fn )
 			_fnLog( oSettings, 0, error );
 		}
 
+		// Microsoft often wrap JSON as a string in another JSON object
+		// Let's handle that automatically
+		if (json.d && typeof json.d === 'string') {
+			try {
+				json = JSON.parse(json.d);
+			}
+			catch (e) {
+				// noop
+			}
+		}
+
 		oSettings.json = json;
 
 		_fnCallbackFire( oSettings, null, 'xhr', [oSettings, json, oSettings.jqXHR], true );
@@ -4046,11 +4145,11 @@ function _fnBuildAjax( oSettings, data, fn )
 	else {
 		// Object to extend the base settings
 		oSettings.jqXHR = $.ajax( baseAjax );
+	}
 
-		// Restore for next time around
-		if ( ajaxData ) {
-			ajax.data = ajaxData;
-		}
+	// Restore for next time around
+	if ( ajaxData ) {
+		ajax.data = ajaxData;
 	}
 }
 
@@ -4275,10 +4374,6 @@ function _fnFilterComplete ( settings, input )
 {
 	var columnsSearch = settings.aoPreSearchCols;
 
-	// Resolve any column types that are unknown due to addition or invalidation
-	// @todo As per sort - can this be moved into an event handler?
-	_fnColumnTypes( settings );
-
 	// In server-side processing all filtering is done by the server, so no point hanging around here
 	if ( _fnDataSource( settings ) != 'ssp' )
 	{
@@ -4584,8 +4679,11 @@ function _fnFilterData ( settings )
 function _fnInitialise ( settings )
 {
 	var i, iAjaxStart=settings.iInitDisplayStart;
+	var init = settings.oInit;
+	var deferLoading = settings.deferLoading;
+	var dataSrc = _fnDataSource( settings );
 
-	/* Ensure that the table data is fully initialised */
+	// Ensure that the table data is fully initialised
 	if ( ! settings.bInitialised ) {
 		setTimeout( function(){ _fnInitialise( settings ); }, 200 );
 		return;
@@ -4597,52 +4695,68 @@ function _fnInitialise ( settings )
 	_fnDrawHead( settings, settings.aoHeader );
 	_fnDrawHead( settings, settings.aoFooter );
 
-	// Enable features
-	_fnAddOptionsHtml( settings );
-	_fnSortInit( settings );
+	// Load the table's state (if needed) and then render around it and draw draw
+	_fnLoadState( settings, init, function () {
+		// Local data load
+		// Check if there is data passing into the constructor
+		if ( init.aaData ) {
+			for ( i=0 ; i<init.aaData.length ; i++ ) {
+				_fnAddData( settings, init.aaData[ i ] );
+			}
+		}
+		else if ( deferLoading || dataSrc == 'dom' ) {
+			// Grab the data from the page
+			_fnAddTr( settings, $(settings.nTBody).children('tr') );
+		}
 
-	_colGroup( settings );
+		// Filter not yet applied - copy the display master
+		settings.aiDisplay = settings.aiDisplayMaster.slice();
 
-	/* Okay to show that something is going on now */
-	_fnProcessingDisplay( settings, true );
+		// Enable features
+		_fnAddOptionsHtml( settings );
+		_fnSortInit( settings );
 
-	_fnCallbackFire( settings, null, 'preInit', [settings], true );
+		_colGroup( settings );
 
-	// If there is default sorting required - let's do it. The sort function
-	// will do the drawing for us. Otherwise we draw the table regardless of the
-	// Ajax source - this allows the table to look initialised for Ajax sourcing
-	// data (show 'loading' message possibly)
-	_fnReDraw( settings );
+		/* Okay to show that something is going on now */
+		_fnProcessingDisplay( settings, true );
 
-	var dataSrc = _fnDataSource( settings );
+		_fnCallbackFire( settings, null, 'preInit', [settings], true );
 
-	// Server-side processing init complete is done by _fnAjaxUpdateDraw
-	if ( dataSrc != 'ssp' ) {
-		// if there is an ajax source load the data
-		if ( dataSrc == 'ajax' ) {
-			_fnBuildAjax( settings, {}, function(json) {
-				var aData = _fnAjaxDataSrc( settings, json );
+		// If there is default sorting required - let's do it. The sort function
+		// will do the drawing for us. Otherwise we draw the table regardless of the
+		// Ajax source - this allows the table to look initialised for Ajax sourcing
+		// data (show 'loading' message possibly)
+		_fnReDraw( settings );
 
-				// Got the data - add it to the table
-				for ( i=0 ; i<aData.length ; i++ ) {
-					_fnAddData( settings, aData[i] );
-				}
+		// Server-side processing init complete is done by _fnAjaxUpdateDraw
+		if ( dataSrc != 'ssp' || deferLoading ) {
+			// if there is an ajax source load the data
+			if ( dataSrc == 'ajax' ) {
+				_fnBuildAjax( settings, {}, function(json) {
+					var aData = _fnAjaxDataSrc( settings, json );
 
-				// Reset the init display for cookie saving. We've already done
-				// a filter, and therefore cleared it before. So we need to make
-				// it appear 'fresh'
-				settings.iInitDisplayStart = iAjaxStart;
+					// Got the data - add it to the table
+					for ( i=0 ; i<aData.length ; i++ ) {
+						_fnAddData( settings, aData[i] );
+					}
 
-				_fnReDraw( settings );
-				_fnProcessingDisplay( settings, false );
+					// Reset the init display for cookie saving. We've already done
+					// a filter, and therefore cleared it before. So we need to make
+					// it appear 'fresh'
+					settings.iInitDisplayStart = iAjaxStart;
+
+					_fnReDraw( settings );
+					_fnProcessingDisplay( settings, false );
+					_fnInitComplete( settings );
+				}, settings );
+			}
+			else {
 				_fnInitComplete( settings );
-			}, settings );
-		}
-		else {
-			_fnInitComplete( settings );
-			_fnProcessingDisplay( settings, false );
+				_fnProcessingDisplay( settings, false );
+			}
 		}
-	}
+	} );
 }
 
 
@@ -4799,6 +4913,30 @@ function _fnProcessingDisplay ( settings, show )
 {
 	_fnCallbackFire( settings, null, 'processing', [settings, show] );
 }
+
+/**
+ * Show the processing element if an action takes longer than a given time
+ *
+ * @param {*} settings DataTables settings object
+ * @param {*} enable Do (true) or not (false) async processing (local feature enablement)
+ * @param {*} run Function to run
+ */
+function _fnProcessingRun( settings, enable, run ) {
+	if (! enable) {
+		// Immediate execution, synchronous
+		run();
+	}
+	else {
+		_fnProcessingDisplay(settings, true);
+		
+		// Allow the processing display to show if needed
+		setTimeout(function () {
+			run();
+
+			_fnProcessingDisplay(settings, false);
+		}, 0);
+	}
+}
 /**
  * Add any control elements for the table - specifically scrolling
  *  @param {object} settings dataTables settings object
@@ -5129,8 +5267,17 @@ function _fnCalculateColumnWidths ( settings )
 		tableWidthAttr = table.getAttribute('width'), // from DOM element
 		tableContainer = table.parentNode,
 		i, column, columnIdx;
-
+		
 	var styleWidth = table.style.width;
+
+	// If there is no width applied as a CSS style or as an attribute, we assume that
+	// the width is intended to be 100%, which is usually is in CSS, but it is very
+	// difficult to correctly parse the rules to get the final result.
+	if ( ! styleWidth && ! tableWidthAttr) {
+		table.style.width = '100%';
+		styleWidth = '100%';
+	}
+
 	if ( styleWidth && styleWidth.indexOf('%') !== -1 ) {
 		tableWidthAttr = styleWidth;
 	}
@@ -5444,22 +5591,16 @@ function _fnSortAttachListener(settings, node, selector, column, callback) {
 			}
 
 			if (run) {
-				_fnProcessingDisplay( settings, true );
-
-				// Allow the processing display to show
-				setTimeout( function () {
+				_fnProcessingRun(settings, true, function () {
 					_fnSort( settings );
 					_fnSortDisplay( settings, settings.aiDisplay );
 
-					// Sort processing done - redraw has its own processing display
-					_fnProcessingDisplay( settings, false );
-
 					_fnReDraw( settings, false, false );
 
 					if (callback) {
 						callback();
 					}
-				}, 0);
+				});
 			}
 		}
 	} );
@@ -5618,11 +5759,6 @@ function _fnSort ( oSettings, col, dir )
 		displayMaster = oSettings.aiDisplayMaster,
 		aSort;
 
-	// Resolve any column types that are unknown due to addition or invalidation
-	// @todo Can this be moved into a 'data-ready' handler which is called when
-	//   data is going to be used in the table?
-	_fnColumnTypes( oSettings );
-
 	// Allow a specific column to be sorted, which will _not_ alter the display
 	// master
 	if (col !== undefined) {
@@ -5659,7 +5795,7 @@ function _fnSort ( oSettings, col, dir )
 
 		// If the first sort is desc, then reverse the array to preserve original
 		// order, just in reverse
-		if (aSort.length && aSort[0].dir === 'desc') {
+		if (aSort.length && aSort[0].dir === 'desc' && oSettings.orderDescReverse) {
 			aiOrig.reverse();
 		}
 
@@ -5729,6 +5865,7 @@ function _fnSort ( oSettings, col, dir )
 	if (col === undefined) {
 		// Tell the draw function that we have sorted the data
 		oSettings.bSorted = true;
+		oSettings.sortDetails = aSort;
 
 		_fnCallbackFire( oSettings, null, 'order', [oSettings, aSort] );
 	}
@@ -7507,6 +7644,16 @@ var _selector_row_indexes = function ( settings, opts )
 		order  = opts.order,   // applied, current, index (original - compatibility with 1.9)
 		page   = opts.page;    // all, current
 
+	if ( _fnDataSource( settings ) == 'ssp' ) {
+		// In server-side processing mode, most options are irrelevant since
+		// rows not shown don't exist and the index order is the applied order
+		// Removed is a special case - for consistency just return an empty
+		// array
+		return search === 'removed' ?
+			[] :
+			_range( 0, displayMaster.length );
+	}
+
 	if ( page == 'current' ) {
 		// Current page implies that order=current and filter=applied, since it is
 		// fairly senseless otherwise, regardless of what order and search actually
@@ -8178,7 +8325,7 @@ _api_register( [
 _api_register( _child_obj+'.isShown()', function () {
 	var ctx = this.context;
 
-	if ( ctx.length && this.length ) {
+	if ( ctx.length && this.length && ctx[0].aoData[ this[0] ] ) {
 		// _detailsShown as false or undefined will fall through to return false
 		return ctx[0].aoData[ this[0] ]._detailsShow || false;
 	}
@@ -8201,7 +8348,7 @@ _api_register( _child_obj+'.isShown()', function () {
 // can be an array of these items, comma separated list, or an array of comma
 // separated lists
 
-var __re_column_selector = /^([^:]+):(name|title|visIdx|visible)$/;
+var __re_column_selector = /^([^:]+)?:(name|title|visIdx|visible)$/;
 
 
 // r1 and r2 are redundant - but it means that the parameters match for the
@@ -8273,17 +8420,24 @@ var __column_selector = function ( settings, selector, opts )
 			switch( match[2] ) {
 				case 'visIdx':
 				case 'visible':
-					var idx = parseInt( match[1], 10 );
-					// Visible index given, convert to column index
-					if ( idx < 0 ) {
-						// Counting from the right
-						var visColumns = columns.map( function (col,i) {
-							return col.bVisible ? i : null;
-						} );
-						return [ visColumns[ visColumns.length + idx ] ];
+					if (match[1]) {
+						var idx = parseInt( match[1], 10 );
+						// Visible index given, convert to column index
+						if ( idx < 0 ) {
+							// Counting from the right
+							var visColumns = columns.map( function (col,i) {
+								return col.bVisible ? i : null;
+							} );
+							return [ visColumns[ visColumns.length + idx ] ];
+						}
+						// Counting from the left
+						return [ _fnVisibleToColumnIndex( settings, idx ) ];
 					}
-					// Counting from the left
-					return [ _fnVisibleToColumnIndex( settings, idx ) ];
+					
+					// `:visible` on its own
+					return columns.map( function (col, i) {
+						return col.bVisible ? i : null;
+					} );
 
 				case 'name':
 					// match by name. `names` is column index complete and in order
@@ -9133,23 +9287,60 @@ _api_register( 'state.save()', function () {
 } );
 
 /**
- * Set the jQuery or window object to be used by DataTables
- *
- * @param {*} module Library / container object
- * @param {string} [type] Library or container type `lib`, `win` or `datetime`.
- *   If not provided, automatic detection is attempted.
- */
-DataTable.use = function (module, type) {
-	if (type === 'lib' || module.fn) {
+ * Set the libraries that DataTables uses, or the global objects.
+ * Note that the arguments can be either way around (legacy support)
+ * and the second is optional. See docs.
+ */
+DataTable.use = function (arg1, arg2) {
+	// Reverse arguments for legacy support
+	var module = typeof arg1 === 'string'
+		? arg2
+		: arg1;
+	var type = typeof arg2 === 'string'
+		? arg2
+		: arg1;
+
+	// Getter
+	if (module === undefined && typeof type === 'string') {
+		switch (type) {
+			case 'lib':
+			case 'jq':
+				return $;
+
+			case 'win':
+				return window;
+
+			case 'datetime':
+				return DataTable.DateTime;
+
+			case 'luxon':
+				return __luxon;
+
+			case 'moment':
+				return __moment;
+
+			default:
+				return null;
+		}
+	}
+
+	// Setter
+	if (type === 'lib' || type === 'jq' || (module && module.fn && module.fn.jquery)) {
 		$ = module;
 	}
-	else if (type == 'win' || module.document) {
+	else if (type == 'win' || (module && module.document)) {
 		window = module;
 		document = module.document;
 	}
-	else if (type === 'datetime' || module.type === 'DateTime') {
+	else if (type === 'datetime' || (module && module.type === 'DateTime')) {
 		DataTable.DateTime = module;
 	}
+	else if (type === 'luxon' || (module && module.FixedOffsetZone)) {
+		__luxon = module;
+	}
+	else if (type === 'moment' || (module && module.isMoment)) {
+		__moment = module;
+	}
 }
 
 /**
@@ -9558,7 +9749,7 @@ _api_register( 'i18n()', function ( token, def, plural ) {
  *  @type string
  *  @default Version number
  */
-DataTable.version = "2.0.7";
+DataTable.version = "2.1.0";
 
 /**
  * Private data store, containing all of the settings objects that are
@@ -10403,7 +10594,8 @@ DataTable.defaults = {
 				first: 'First',
 				last: 'Last',
 				next: 'Next',
-				previous: 'Previous'
+				previous: 'Previous',
+				number: ''
 			}
 		},
 
@@ -10583,6 +10775,10 @@ DataTable.defaults = {
 	},
 
 
+	/** The initial data order is reversed when `desc` ordering */
+	orderDescReverse: true,
+
+
 	/**
 	 * This parameter allows you to have define the global filtering state at
 	 * initialisation time. As an object the `search` parameter must be
@@ -10631,7 +10827,7 @@ DataTable.defaults = {
 	 * * `full_numbers` - 'First', 'Previous', 'Next' and 'Last' buttons, plus page numbers
 	 * * `first_last_numbers` - 'First' and 'Last' buttons, plus page numbers
 	 */
-	"sPaginationType": "full_numbers",
+	"sPaginationType": "",
 
 
 	/**
@@ -10701,7 +10897,13 @@ DataTable.defaults = {
 	/**
 	 * Caption value
 	 */
-	"caption": null
+	"caption": null,
+
+
+	/**
+	 * For server-side processing - use the data from the DOM for the first draw
+	 */
+	iDeferLoading: null
 };
 
 _fnHungarianMap( DataTable.defaults );
@@ -11644,7 +11846,10 @@ DataTable.models.oSettings = {
 
 	captionNode: null,
 
-	colgroup: null
+	colgroup: null,
+
+	/** Delay loading of data */
+	deferLoading: null
 };
 
 /**
@@ -11668,7 +11873,7 @@ $.extend( extPagination, {
 	},
 
 	full: function () {
-		return [  'first', 'previous', 'next', 'last' ];
+		return [ 'first', 'previous', 'next', 'last' ];
 	},
 
 	numbers: function () {
@@ -11682,11 +11887,11 @@ $.extend( extPagination, {
 	full_numbers: function () {
 		return [ 'first', 'previous', 'numbers', 'next', 'last' ];
 	},
-	
+
 	first_last: function () {
 		return ['first', 'last'];
 	},
-	
+
 	first_last_numbers: function () {
 		return ['first', 'numbers', 'last'];
 	},
@@ -11768,38 +11973,56 @@ var _filterString = function (stripHtml, normalize) {
  * to make working with DataTables a little bit easier.
  */
 
-function __mldFnName(name) {
-	return name.replace(/[\W]/g, '_')
-}
-
-// Common logic for moment, luxon or a date action
-function __mld( dt, momentFn, luxonFn, dateFn, arg1 ) {
-	if (window.moment) {
-		return dt[momentFn]( arg1 );
+/**
+ * Common logic for moment, luxon or a date action.
+ *
+ * Happens after __mldObj, so don't need to call `resolveWindowsLibs` again
+ */
+function __mld( dtLib, momentFn, luxonFn, dateFn, arg1 ) {
+	if (__moment) {
+		return dtLib[momentFn]( arg1 );
 	}
-	else if (window.luxon) {
-		return dt[luxonFn]( arg1 );
+	else if (__luxon) {
+		return dtLib[luxonFn]( arg1 );
 	}
 	
-	return dateFn ? dt[dateFn]( arg1 ) : dt;
+	return dateFn ? dtLib[dateFn]( arg1 ) : dtLib;
 }
 
 
 var __mlWarning = false;
+var __luxon; // Can be assigned in DateTeble.use()
+var __moment; // Can be assigned in DateTeble.use()
+
+/**
+ * 
+ */
+function resolveWindowLibs() {
+	if (window.luxon && ! __luxon) {
+		__luxon = window.luxon;
+	}
+	
+	if (window.moment && ! __moment) {
+		__moment = window.moment;
+	}
+}
+
 function __mldObj (d, format, locale) {
 	var dt;
 
-	if (window.moment) {
-		dt = window.moment.utc( d, format, locale, true );
+	resolveWindowLibs();
+
+	if (__moment) {
+		dt = __moment.utc( d, format, locale, true );
 
 		if (! dt.isValid()) {
 			return null;
 		}
 	}
-	else if (window.luxon) {
+	else if (__luxon) {
 		dt = format && typeof d === 'string'
-			? window.luxon.DateTime.fromFormat( d, format )
-			: window.luxon.DateTime.fromISO( d );
+			? __luxon.DateTime.fromFormat( d, format )
+			: __luxon.DateTime.fromISO( d );
 
 		if (! dt.isValid) {
 			return null;
@@ -11844,7 +12067,7 @@ function __mlHelper (localeString) {
 			from = null;
 		}
 
-		var typeName = 'datetime' + (to ? '-' + __mldFnName(to) : '');
+		var typeName = 'datetime' + (to ? '-' + to : '');
 
 		// Add type detection and sorting specific to this date format - we need to be able to identify
 		// date type columns as such, rather than as numbers in extensions. Hence the need for this.
@@ -11947,7 +12170,7 @@ if (window.Intl !== undefined) {
 
 // Formatted date time detection - use by declaring the formats you are going to use
 DataTable.datetime = function ( format, locale ) {
-	var typeName = 'datetime-detect-' + __mldFnName(format);
+	var typeName = 'datetime-' + format;
 
 	if (! locale) {
 		locale = 'en';
@@ -12102,27 +12325,20 @@ DataTable.type = function (name, prop, val) {
 	var setProp = function(prop, propVal) {
 		_extTypes[prop][name] = propVal;
 	};
-	var setDetect = function (fn) {
-		// Wrap to allow the function to return `true` rather than
-		// specifying the type name.
-		var cb = function (d, s) {
-			var ret = fn(d, s);
-
-			return ret === true
-				? name
-				: ret;
-		};
-		Object.defineProperty(cb, "name", {value: name});
+	var setDetect = function (detect) {
+		// `detect` can be a function or an object - we set a name
+		// property for either - that is used for the detection
+		Object.defineProperty(detect, "name", {value: name});
 
-		var idx = _extTypes.detect.findIndex(function (fn) {
-			return fn.name === name;
+		var idx = _extTypes.detect.findIndex(function (item) {
+			return item.name === name;
 		});
 
 		if (idx === -1) {
-			_extTypes.detect.unshift(cb);
+			_extTypes.detect.unshift(detect);
 		}
 		else {
-			_extTypes.detect.splice(idx, 1, cb);
+			_extTypes.detect.splice(idx, 1, detect);
 		}
 	};
 	var setOrder = function (obj) {
@@ -12182,6 +12398,19 @@ DataTable.types = function () {
 	});
 };
 
+var __diacriticSort = function (a, b) {
+	a = a.toString().toLowerCase();
+	b = b.toString().toLowerCase();
+
+	// Checked for `navigator.languages` support in `oneOf` so this code can't execute in old
+	// Safari and thus can disable this check
+	// eslint-disable-next-line compat/compat
+	return a.localeCompare(b, navigator.languages[0] || navigator.language, {
+		numeric: true,
+		ignorePunctuation: true,
+	});
+}
+
 //
 // Built in data types
 //
@@ -12206,11 +12435,38 @@ DataTable.type('string', {
 	search: _filterString(false, true)
 });
 
+DataTable.type('string-utf8', {
+	detect: {
+		allOf: function ( d ) {
+			return true;
+		},
+		oneOf: function ( d ) {
+			// At least one data point must contain a non-ASCII character
+			// This line will also check if navigator.languages is supported or not. If not (Safari 10.0-)
+			// this data type won't be supported.
+			// eslint-disable-next-line compat/compat
+			return ! _empty( d ) && navigator.languages && typeof d === 'string' && d.match(/[^\x00-\x7F]/);
+		}
+	},
+	order: {
+		asc: __diacriticSort,
+		desc: function (a, b) {
+			return __diacriticSort(a, b) * -1;
+		}
+	},
+	search: _filterString(false, true)
+});
+
 
 DataTable.type('html', {
-	detect: function ( d ) {
-		return _empty( d ) || (typeof d === 'string' && d.indexOf('<') !== -1) ?
-			'html' : null;
+	detect: {
+		allOf: function ( d ) {
+			return _empty( d ) || (typeof d === 'string' && d.indexOf('<') !== -1);
+		},
+		oneOf: function ( d ) {
+			// At least one data point must contain a `<`
+			return ! _empty( d ) && typeof d === 'string' && d.indexOf('<') !== -1;
+		}
 	},
 	order: {
 		pre: function ( a ) {
@@ -12227,16 +12483,21 @@ DataTable.type('html', {
 
 DataTable.type('date', {
 	className: 'dt-type-date',
-	detect: function ( d )
-	{
-		// V8 tries _very_ hard to make a string passed into `Date.parse()`
-		// valid, so we need to use a regex to restrict date formats. Use a
-		// plug-in for anything other than ISO8601 style strings
-		if ( d && !(d instanceof Date) && ! _re_date.test(d) ) {
-			return null;
+	detect: {
+		allOf: function ( d ) {
+			// V8 tries _very_ hard to make a string passed into `Date.parse()`
+			// valid, so we need to use a regex to restrict date formats. Use a
+			// plug-in for anything other than ISO8601 style strings
+			if ( d && !(d instanceof Date) && ! _re_date.test(d) ) {
+				return null;
+			}
+			var parsed = Date.parse(d);
+			return (parsed !== null && !isNaN(parsed)) || _empty(d);
+		},
+		oneOf: function ( d ) {
+			// At least one entry must be a date or a string with a date
+			return (d instanceof Date) || (typeof d === 'string' && _re_date.test(d));
 		}
-		var parsed = Date.parse(d);
-		return (parsed !== null && !isNaN(parsed)) || _empty(d) ? 'date' : null;
 	},
 	order: {
 		pre: function ( d ) {
@@ -12249,10 +12510,16 @@ DataTable.type('date', {
 
 DataTable.type('html-num-fmt', {
 	className: 'dt-type-numeric',
-	detect: function ( d, settings )
-	{
-		var decimal = settings.oLanguage.sDecimal;
-		return _htmlNumeric( d, decimal, true ) ? 'html-num-fmt' : null;
+	detect: {
+		allOf: function ( d, settings ) {
+			var decimal = settings.oLanguage.sDecimal;
+			return _htmlNumeric( d, decimal, true, false );
+		},
+		oneOf: function (d, settings) {
+			// At least one data point must contain a numeric value
+			var decimal = settings.oLanguage.sDecimal;
+			return _htmlNumeric( d, decimal, true, false );
+		}
 	},
 	order: {
 		pre: function ( d, s ) {
@@ -12266,10 +12533,16 @@ DataTable.type('html-num-fmt', {
 
 DataTable.type('html-num', {
 	className: 'dt-type-numeric',
-	detect: function ( d, settings )
-	{
-		var decimal = settings.oLanguage.sDecimal;
-		return _htmlNumeric( d, decimal ) ? 'html-num' : null;
+	detect: {
+		allOf: function ( d, settings ) {
+			var decimal = settings.oLanguage.sDecimal;
+			return _htmlNumeric( d, decimal, false, true );
+		},
+		oneOf: function (d, settings) {
+			// At least one data point must contain a numeric value
+			var decimal = settings.oLanguage.sDecimal;
+			return _htmlNumeric( d, decimal, false, false );
+		}
 	},
 	order: {
 		pre: function ( d, s ) {
@@ -12283,10 +12556,16 @@ DataTable.type('html-num', {
 
 DataTable.type('num-fmt', {
 	className: 'dt-type-numeric',
-	detect: function ( d, settings )
-	{
-		var decimal = settings.oLanguage.sDecimal;
-		return _isNumber( d, decimal, true ) ? 'num-fmt' : null;
+	detect: {
+		allOf: function ( d, settings ) {
+			var decimal = settings.oLanguage.sDecimal;
+			return _isNumber( d, decimal, true, true );
+		},
+		oneOf: function (d, settings) {
+			// At least one data point must contain a numeric value
+			var decimal = settings.oLanguage.sDecimal;
+			return _isNumber( d, decimal, true, false );
+		}
 	},
 	order: {
 		pre: function ( d, s ) {
@@ -12299,10 +12578,16 @@ DataTable.type('num-fmt', {
 
 DataTable.type('num', {
 	className: 'dt-type-numeric',
-	detect: function ( d, settings )
-	{
-		var decimal = settings.oLanguage.sDecimal;
-		return _isNumber( d, decimal ) ? 'num' : null;
+	detect: {
+		allOf: function ( d, settings ) {
+			var decimal = settings.oLanguage.sDecimal;
+			return _isNumber( d, decimal, false, true );
+		},
+		oneOf: function (d, settings) {
+			// At least one data point must contain a numeric value
+			var decimal = settings.oLanguage.sDecimal;
+			return _isNumber( d, decimal, false, false );
+		}
 	},
 	order: {
 		pre: function (d, s) {
@@ -12386,7 +12671,7 @@ $.extend( true, DataTable.ext.renderer, {
 			// `DT` namespace will allow the event to be removed automatically
 			// on destroy, while the `dt` namespaced event is the one we are
 			// listening for
-			$(settings.nTable).on( 'order.dt.DT', function ( e, ctx, sorting ) {
+			$(settings.nTable).on( 'order.dt.DT column-visibility.dt.DT', function ( e, ctx ) {
 				if ( settings !== ctx ) { // need to check this this is the host
 					return;               // table, not a nested one
 				}
@@ -12398,9 +12683,15 @@ $.extend( true, DataTable.ext.renderer, {
 				var ariaType = '';
 				var indexes = columns.indexes();
 				var sortDirs = columns.orderable(true).flatten();
-				var orderedColumns = ',' + sorting.map( function (val) {
-					return val.col;
-				} ).join(',') + ',';
+				var sorting = ctx.sortDetails;
+				var orderedColumns = ',' + sorting
+					.filter( function (sort) {
+						// Filter to just the visible columns
+						return ctx.aoColumns[sort.col].bVisible;
+					} )
+					.map( function (sort) {
+						return sort.col;
+					} ).join(',') + ',';
 
 				cell
 					.removeClass(
@@ -12410,7 +12701,8 @@ $.extend( true, DataTable.ext.renderer, {
 					.toggleClass( orderClasses.none, ! orderable )
 					.toggleClass( orderClasses.canAsc, orderable && sortDirs.includes('asc') )
 					.toggleClass( orderClasses.canDesc, orderable && sortDirs.includes('desc') );
-				
+
+				// Get the index of this cell in the sort array
 				var sortIdx = orderedColumns.indexOf( ',' + indexes.toArray().join(',') + ',' );
 
 				if ( sortIdx !== -1 ) {
@@ -12454,23 +12746,40 @@ $.extend( true, DataTable.ext.renderer, {
 
 	layout: {
 		_: function ( settings, container, items ) {
+			var classes = settings.oClasses.layout;
 			var row = $('<div/>')
-				.addClass('dt-layout-row')
+				.attr('id', items.id || null)
+				.addClass(items.className || classes.row)
 				.appendTo( container );
 
 			$.each( items, function (key, val) {
-				var klass = ! val.table ?
-					'dt-'+key+' ' :
-					'';
+				if (key === 'id' || key === 'className') {
+					return;
+				}
+
+				var klass = '';
 
 				if (val.table) {
-					row.addClass('dt-layout-table');
+					row.addClass(classes.tableRow);
+					klass += classes.tableCell + ' ';
+				}
+
+				if (key === 'start') {
+					klass += classes.start;
+				}
+				else if (key === 'end') {
+					klass += classes.end;
+				}
+				else {
+					klass += classes.full;
 				}
 
 				$('<div/>')
 					.attr({
 						id: val.id || null,
-						"class": 'dt-layout-cell '+klass+(val.className || '')
+						"class": val.className
+							? val.className
+							: classes.cell + ' ' + klass
 					})
 					.append( val.contents )
 					.appendTo( row );
@@ -12494,6 +12803,25 @@ DataTable.feature.register = function ( name, cb, legacy ) {
 	}
 };
 
+function _divProp(el, prop, val) {
+	if (val) {
+		el[prop] = val;
+	}
+}
+
+DataTable.feature.register( 'div', function ( settings, opts ) {
+	var n = $('<div>')[0];
+
+	if (opts) {
+		_divProp(n, 'className', opts.className);
+		_divProp(n, 'id', opts.id);
+		_divProp(n, 'innerHTML', opts.html);
+		_divProp(n, 'textContent', opts.text);
+	}
+
+	return n;
+} );
+
 DataTable.feature.register( 'info', function ( settings, opts ) {
 	// For compatibility with the legacy `info` top level option
 	if (! settings.oFeatures.bInfo) {
@@ -12593,6 +12921,7 @@ DataTable.feature.register( 'search', function ( settings, opts ) {
 
 	opts = $.extend({
 		placeholder: language.sSearchPlaceholder,
+		processing: false,
 		text: language.sSearch
 	}, opts);
 
@@ -12636,13 +12965,15 @@ DataTable.feature.register( 'search', function ( settings, opts ) {
 
 		/* Now do the filter */
 		if ( val != previousSearch.search ) {
-			previousSearch.search = val;
-
-			_fnFilterComplete( settings, previousSearch );
-
-			// Need to redraw, without resorting
-			settings._iDisplayStart = 0;
-			_fnDraw( settings );
+			_fnProcessingRun(settings, opts.processing, function () {
+				previousSearch.search = val;
+		
+				_fnFilterComplete( settings, previousSearch );
+		
+				// Need to redraw, without resorting
+				settings._iDisplayStart = 0;
+				_fnDraw( settings );
+			});
 		}
 	};
 
@@ -12700,17 +13031,17 @@ DataTable.feature.register( 'paging', function ( settings, opts ) {
 	opts = $.extend({
 		buttons: DataTable.ext.pager.numbers_length,
 		type: settings.sPaginationType,
-		boundaryNumbers: true
+		boundaryNumbers: true,
+		firstLast: true,
+		previousNext: true,
+		numbers: true
 	}, opts);
 
-	// To be removed in 2.1
-	if (opts.numbers) {
-		opts.buttons = opts.numbers;
-	}
-
-	var host = $('<div/>').addClass( settings.oClasses.paging.container + ' paging_' + opts.type );
+	var host = $('<div/>')
+		.addClass(settings.oClasses.paging.container + (opts.type ? ' paging_' + opts.type : ''))
+		.append('<nav>');
 	var draw = function () {
-		_pagingDraw(settings, host, opts);
+		_pagingDraw(settings, host.children(), opts);
 	};
 
 	settings.aoDrawCallback.push(draw);
@@ -12721,13 +13052,39 @@ DataTable.feature.register( 'paging', function ( settings, opts ) {
 	return host;
 }, 'p' );
 
+/**
+ * Dynamically create the button type array based on the configuration options.
+ * This will only happen if the paging type is not defined.
+ */
+function _pagingDynamic(opts) {
+	var out = [];
+
+	if (opts.numbers) {
+		out.push('numbers');
+	}
+
+	if (opts.previousNext) {
+		out.unshift('previous');
+		out.push('next');
+	}
+
+	if (opts.firstLast) {
+		out.unshift('first');
+		out.push('last');
+	}
+
+	return out;
+}
+
 function _pagingDraw(settings, host, opts) {
 	if (! settings._bInitComplete) {
 		return;
 	}
 
 	var
-		plugin = DataTable.ext.pager[ opts.type ],
+		plugin = opts.type
+			? DataTable.ext.pager[ opts.type ]
+			: _pagingDynamic,
 		aria = settings.oLanguage.oAria.paginate || {},
 		start      = settings._iDisplayStart,
 		len        = settings._iDisplayLength,
@@ -12735,7 +13092,7 @@ function _pagingDraw(settings, host, opts) {
 		all        = len === -1,
 		page = all ? 0 : Math.ceil( start / len ),
 		pages = all ? 1 : Math.ceil( visRecords / len ),
-		buttons = plugin()
+		buttons = plugin(opts)
 			.map(function (val) {
 				return val === 'numbers'
 					? _pagingNumbers(page, pages, opts.buttons, opts.boundaryNumbers)
@@ -12757,14 +13114,24 @@ function _pagingDraw(settings, host, opts) {
 			btnInfo.disabled
 		);
 
+		var ariaLabel = typeof button === 'string'
+			? aria[ button ]
+			: aria.number
+				? aria.number + (button+1)
+				: null;
+
 		// Common attributes
 		$(btn.clicker).attr({
 			'aria-controls': settings.sTableId,
 			'aria-disabled': btnInfo.disabled ? 'true' : null,
 			'aria-current': btnInfo.active ? 'page' : null,
-			'aria-label': aria[ button ],
+			'aria-label': ariaLabel,
 			'data-dt-idx': button,
-			'tabIndex': btnInfo.disabled ? -1 : settings.iTabIndex,
+			'tabIndex': btnInfo.disabled
+				? -1
+				: settings.iTabIndex
+					? settings.iTabIndex
+					: null, // `0` doesn't need a tabIndex since it is the default
 		});
 
 		if (typeof button !== 'number') {
@@ -12798,10 +13165,10 @@ function _pagingDraw(settings, host, opts) {
 	// height of the buttons and the container.
 	if (
 		buttonEls.length && // any buttons
-		opts.numbers > 1 && // prevent infinite
+		opts.buttons > 1 && // prevent infinite
 		$(host).height() >= ($(buttonEls[0]).outerHeight() * 2) - 10
 	) {
-		_pagingDraw(settings, host, $.extend({}, opts, { numbers: opts.numbers - 2 }));
+		_pagingDraw(settings, host, $.extend({}, opts, { buttons: opts.buttons - 2 }));
 	}
 }
 
@@ -13003,10 +13370,11 @@ DataTable.feature.register( 'pageLength', function ( settings, opts ) {
 	}
 
 	// Wrapper element - use a span as a holder for where the select will go
+	var tmpId = 'tmp-' + (+new Date())
 	var div = $('<div/>')
 		.addClass( classes.container )
 		.append(
-			str.replace( '_MENU_', '<span></span>' )
+			str.replace( '_MENU_', '<span id="'+tmpId+'"></span>' )
 		);
 
 	// Save text node content for macro updating
@@ -13049,7 +13417,7 @@ DataTable.feature.register( 'pageLength', function ( settings, opts ) {
 	__lengthCounter++;
 
 	// Swap in the select list
-	div.find('span').replaceWith(select);
+	div.find('#' + tmpId).replaceWith(select);
 
 	// Can't use `select` variable as user might provide their own and the
 	// reference is broken by the use of outerHTML