datatables.net 2.1.4 → 2.1.6

package/js/dataTables.mjs

@@ -1,4 +1,4 @@
-/*! DataTables 2.1.4
+/*! DataTables 2.1.6
  * © SpryMedia Ltd - datatables.net/license
  */
 
@@ -201,6 +201,7 @@ var DataTable = function ( selector, options )
 			"caption",
 			"layout",
 			"orderDescReverse",
+			"typeDetect",
 			[ "iCookieDuration", "iStateDuration" ], // backwards compat
 			[ "oSearch", "oPreviousSearch" ],
 			[ "aoSearchCols", "aoPreSearchCols" ],
@@ -424,7 +425,7 @@ var DataTable = function ( selector, options )
 			} );
 		}
 		else {
-			_fnCallbackFire( oSettings, null, 'i18n', [oSettings]);
+			_fnCallbackFire( oSettings, null, 'i18n', [oSettings], true);
 			_fnInitialise( oSettings );
 		}
 	} );
@@ -1000,7 +1001,8 @@ $.extend( DataTable.ext.classes, {
 		active: 'current',
 		button: 'dt-paging-button',
 		container: 'dt-paging',
-		disabled: 'disabled'
+		disabled: 'disabled',
+		nav: ''
 	}
 } );
 
@@ -1163,7 +1165,7 @@ var _pluck_order = function ( a, order, prop, prop2 )
 	// is essential here
 	if ( prop2 !== undefined ) {
 		for ( ; i<ien ; i++ ) {
-			if ( a[ order[i] ][ prop ] ) {
+			if ( a[ order[i] ] && a[ order[i] ][ prop ] ) {
 				out.push( a[ order[i] ][ prop ][ prop2 ] );
 			}
 		}
@@ -2102,7 +2104,11 @@ function _fnColumnSizes ( settings )
 	for (var i=0 ; i<cols.length ; i++) {
 		var width = _fnColumnsSumWidth(settings, [i], false, false);
 
-		cols[i].colEl.css('width', width);
+		// Need to set the min-width, otherwise the browser might try to collapse
+		// it further
+		cols[i].colEl
+			.css('width', width)
+			.css('min-width', width);
 	}
 }
 
@@ -2216,12 +2222,6 @@ function _fnColumnTypes ( settings )
 	var i, ien, j, jen, k, ken;
 	var col, detectedType, cache;
 
-	// 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];
@@ -2231,6 +2231,12 @@ function _fnColumnTypes ( settings )
 			col.sType = col._sManualType;
 		}
 		else if ( ! col.sType ) {
+			// With SSP type detection can be unreliable and error prone, so we provide a way
+			// to turn it off.
+			if (! settings.typeDetect) {
+				return;
+			}
+
 			for ( j=0, jen=types.length ; j<jen ; j++ ) {
 				var typeDetect = types[j];
 
@@ -3068,6 +3074,9 @@ function _fnCreateTr ( oSettings, iRow, nTrIn, anTds )
 				_fnWriteCell(nTd, display[i]);
 			}
 
+			// column class
+			_addClass(nTd, oCol.sClass);
+
 			// Visibility - add or remove as required
 			if ( oCol.bVisible && create )
 			{
@@ -3399,7 +3408,6 @@ function _fnDraw( oSettings, ajaxComplete )
 				var td = aoData.anCells[i];
 
 				_addClass(td, _ext.type.className[col.sType]); // auto class
-				_addClass(td, col.sClass); // column class
 				_addClass(td, oSettings.oClasses.tbody.cell); // all cells
 			}
 
@@ -4280,6 +4288,7 @@ function _fnAjaxUpdateDraw ( settings, json )
 	}
 	settings.aiDisplay = settings.aiDisplayMaster.slice();
 
+	_fnColumnTypes(settings);
 	_fnDraw( settings, true );
 	_fnInitComplete( settings );
 	_fnProcessingDisplay( settings, false );
@@ -5173,21 +5182,37 @@ function _fnScrollDraw ( settings )
 	// is because of Responsive which might remove `col` elements, knocking the alignment
 	// of the indexes out.
 	if (settings.aiDisplay.length) {
-		// Get the column sizes from the first row in the table
-		var colSizes = table.children('tbody').eq(0).children('tr').eq(0).children('th, td').map(function (vis) {
-			return {
-				idx: _fnVisibleToColumnIndex(settings, vis),
-				width: $(this).outerWidth()
+		// Get the column sizes from the first row in the table. This should really be a
+		// [].find, but it wasn't supported in Chrome until Sept 2015, and DT has 10 year
+		// browser support
+		var firstTr = null;
+
+		for (i=0 ; i<settings.aiDisplay.length ; i++) {
+			var idx = settings.aiDisplay[i];
+			var tr = settings.aoData[idx].nTr;
+
+			if (tr) {
+				firstTr = tr;
+				break;
 			}
-		});
+		}
 
-		// Check against what the colgroup > col is set to and correct if needed
-		for (var i=0 ; i<colSizes.length ; i++) {
-			var colEl = settings.aoColumns[ colSizes[i].idx ].colEl[0];
-			var colWidth = colEl.style.width.replace('px', '');
+		if (firstTr) {
+			var colSizes = $(firstTr).children('th, td').map(function (vis) {
+				return {
+					idx: _fnVisibleToColumnIndex(settings, vis),
+					width: $(this).outerWidth()
+				}
+			});
+
+			// Check against what the colgroup > col is set to and correct if needed
+			for (var i=0 ; i<colSizes.length ; i++) {
+				var colEl = settings.aoColumns[ colSizes[i].idx ].colEl[0];
+				var colWidth = colEl.style.width.replace('px', '');
 
-			if (colWidth !== colSizes[i].width) {
-				colEl.style.width = colSizes[i].width + 'px';
+				if (colWidth !== colSizes[i].width) {
+					colEl.style.width = colSizes[i].width + 'px';
+				}
 			}
 		}
 	}
@@ -5330,7 +5355,11 @@ function _fnCalculateColumnWidths ( settings )
 		var width = _fnColumnsSumWidth( settings, this, true, false );
 
 		if ( width ) {
+			// Need to set the width and min-width, otherwise the browser
+			// will attempt to collapse the table beyond want might have
+			// been specified
 			this.style.width = width;
+			this.style.minWidth = width;
 
 			// For scrollX we need to force the column width otherwise the
 			// browser will collapse it. If this width is smaller than the
@@ -6715,6 +6744,7 @@ _Api = function ( context, data )
 		return new _Api( context, data );
 	}
 
+	var i;
 	var settings = [];
 	var ctxSettings = function ( o ) {
 		var a = _toSettings( o );
@@ -6724,7 +6754,7 @@ _Api = function ( context, data )
 	};
 
 	if ( Array.isArray( context ) ) {
-		for ( var i=0, ien=context.length ; i<ien ; i++ ) {
+		for ( i=0 ; i<context.length ; i++ ) {
 			ctxSettings( context[i] );
 		}
 	}
@@ -6739,7 +6769,16 @@ _Api = function ( context, data )
 
 	// Initial data
 	if ( data ) {
-		this.push.apply(this, data);
+		// Chrome can throw a max stack error if apply is called with
+		// too large an array, but apply is faster.
+		if (data.length < 10000) {
+			this.push.apply(this, data);
+		}
+		else {
+			for (i=0 ; i<data.length ; i++) {
+				this.push(data[i]);
+			}
+		}
 	}
 
 	// selector
@@ -9770,7 +9809,7 @@ _api_register( 'i18n()', function ( token, def, plural ) {
  *  @type string
  *  @default Version number
  */
-DataTable.version = "2.1.4";
+DataTable.version = "2.1.6";
 
 /**
  * Private data store, containing all of the settings objects that are
@@ -11870,7 +11909,10 @@ DataTable.models.oSettings = {
 	colgroup: null,
 
 	/** Delay loading of data */
-	deferLoading: null
+	deferLoading: null,
+
+	/** Allow auto type detection */
+	typeDetect: true
 };
 
 /**
@@ -13078,7 +13120,11 @@ DataTable.feature.register( 'paging', function ( settings, opts ) {
 
 	var host = $('<div/>')
 		.addClass(settings.oClasses.paging.container + (opts.type ? ' paging_' + opts.type : ''))
-		.append('<nav>');
+		.append(
+			$('<nav>')
+				.attr('aria-label', 'pagination')
+				.addClass(settings.oClasses.paging.nav)
+		);
 	var draw = function () {
 		_pagingDraw(settings, host.children(), opts);
 	};

package/package.json

@@ -4,7 +4,7 @@
     "main": "js/dataTables.js",
     "module": "js/dataTables.mjs",
     "types": "./types/types.d.ts",
-    "version": "2.1.4",
+    "version": "2.1.6",
     "files": [
         "js/**/*.js",
         "js/**/*.mjs",