datatables.net 2.1.5 → 2.1.7

package/js/dataTables.mjs

@@ -1,4 +1,4 @@
-/*! DataTables 2.1.5
+/*! DataTables 2.1.7
  * © 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 );
 		}
 	} );
@@ -1164,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 ] );
 			}
 		}
@@ -1264,8 +1265,11 @@ var _normalize = function (str, both) {
 	}
 
 	// It is faster to just run `normalize` than it is to check if
-	// we need to with a regex!
-	var res = str.normalize("NFD");
+	// we need to with a regex! (Check as it isn't available in old
+	// Safari)
+	var res = str.normalize
+		? str.normalize("NFD")
+		: str;
 
 	// Equally, here we check if a regex is needed or not
 	return res.length !== str.length
@@ -2103,11 +2107,7 @@ function _fnColumnSizes ( settings )
 	for (var i=0 ; i<cols.length ; i++) {
 		var width = _fnColumnsSumWidth(settings, [i], false, false);
 
-		// 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);
+		cols[i].colEl.css('width', width);
 	}
 }
 
@@ -2204,7 +2204,7 @@ function _fnGetColumns( oSettings, sParam )
  */
 function _typeResult (typeDetect, res) {
 	return res === true
-		? typeDetect.name
+		? typeDetect._name
 		: res;
 }
 
@@ -2221,12 +2221,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];
@@ -2236,6 +2230,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];
 
@@ -2987,8 +2987,8 @@ function _fnGetRowElements( settings, row, colIdx, d )
  * @returns 
  */
 function _fnGetRowDisplay (settings, rowIdx) {
-	let rowModal = settings.aoData[rowIdx];
-	let columns = settings.aoColumns;
+	var rowModal = settings.aoData[rowIdx];
+	var columns = settings.aoColumns;
 
 	if (! rowModal.displayData) {
 		// Need to render and cache
@@ -4287,6 +4287,7 @@ function _fnAjaxUpdateDraw ( settings, json )
 	}
 	settings.aiDisplay = settings.aiDisplayMaster.slice();
 
+	_fnColumnTypes(settings);
 	_fnDraw( settings, true );
 	_fnInitComplete( settings );
 	_fnProcessingDisplay( settings, false );
@@ -5353,11 +5354,7 @@ 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
@@ -7659,7 +7656,7 @@ var _selector_opts = function ( opts )
 // Reduce the API instance to the first item found
 var _selector_first = function ( old )
 {
-	let inst = new _Api(old.context[0]);
+	var inst = new _Api(old.context[0]);
 
 	// Use a push rather than passing to the constructor, since it will
 	// merge arrays down automatically, which isn't what is wanted here
@@ -9654,7 +9651,7 @@ _api_register( 'ready()', function ( fn ) {
 			fn.call(this);
 		}
 		else {
-			this.on('init', function () {
+			this.on('init.dt.DT', function () {
 				fn.call(this);
 			});
 		}
@@ -9807,7 +9804,7 @@ _api_register( 'i18n()', function ( token, def, plural ) {
  *  @type string
  *  @default Version number
  */
-DataTable.version = "2.1.5";
+DataTable.version = "2.1.7";
 
 /**
  * Private data store, containing all of the settings objects that are
@@ -11907,7 +11904,10 @@ DataTable.models.oSettings = {
 	colgroup: null,
 
 	/** Delay loading of data */
-	deferLoading: null
+	deferLoading: null,
+
+	/** Allow auto type detection */
+	typeDetect: true
 };
 
 /**
@@ -12368,7 +12368,7 @@ DataTable.type = function (name, prop, val) {
 		return {
 			className: _extTypes.className[name],
 			detect: _extTypes.detect.find(function (fn) {
-				return fn.name === name;
+				return fn._name === name;
 			}),
 			order: {
 				pre: _extTypes.order[name + '-pre'],
@@ -12386,10 +12386,10 @@ DataTable.type = function (name, prop, val) {
 	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});
+		Object.defineProperty(detect, "_name", {value: name});
 
 		var idx = _extTypes.detect.findIndex(function (item) {
-			return item.name === name;
+			return item._name === name;
 		});
 
 		if (idx === -1) {
@@ -12452,13 +12452,13 @@ DataTable.type = function (name, prop, val) {
 // Get a list of types
 DataTable.types = function () {
 	return _extTypes.detect.map(function (fn) {
-		return fn.name;
+		return fn._name;
 	});
 };
 
 var __diacriticSort = function (a, b) {
-	a = a.toString().toLowerCase();
-	b = b.toString().toLowerCase();
+	a = a !== null && a !== undefined ? a.toString().toLowerCase() : '';
+	b = b !== null && b !== undefined ? 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
@@ -13172,15 +13172,17 @@ function _pagingDraw(settings, host, opts) {
 		all        = len === -1,
 		page = all ? 0 : Math.ceil( start / len ),
 		pages = all ? 1 : Math.ceil( visRecords / len ),
-		buttons = plugin(opts)
+		buttons = [],
+		buttonEls = [],
+		buttonsNested = plugin(opts)
 			.map(function (val) {
 				return val === 'numbers'
 					? _pagingNumbers(page, pages, opts.buttons, opts.boundaryNumbers)
 					: val;
-			})
-			.flat();
+			});
 
-	var buttonEls = [];
+	// .flat() would be better, but not supported in old Safari
+	buttons = buttons.concat.apply(buttons, buttonsNested);
 
 	for (var i=0 ; i<buttons.length ; i++) {
 		var button = buttons[i];
@@ -13459,14 +13461,14 @@ DataTable.feature.register( 'pageLength', function ( settings, opts ) {
 
 	// Save text node content for macro updating
 	var textNodes = [];
-	div.find('label')[0].childNodes.forEach(function (el) {
+	Array.from(div.find('label')[0].childNodes).forEach(function (el) {
 		if (el.nodeType === Node.TEXT_NODE) {
 			textNodes.push({
 				el: el,
 				text: el.textContent
 			});
 		}
-	})
+	});
 
 	// Update the label text in case it has an entries value
 	var updateEntries = function (len) {

package/package.json

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