datatables.net 2.1.6 → 2.1.8

package/js/dataTables.mjs

@@ -1,4 +1,4 @@
-/*! DataTables 2.1.6
+/*! DataTables 2.1.8
  * © SpryMedia Ltd - datatables.net/license
  */
 
@@ -1265,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
@@ -2104,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);
 	}
 }
 
@@ -2205,7 +2204,7 @@ function _fnGetColumns( oSettings, sParam )
  */
 function _typeResult (typeDetect, res) {
 	return res === true
-		? typeDetect.name
+		? typeDetect._name
 		: res;
 }
 
@@ -2988,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
@@ -3195,9 +3194,6 @@ function _fnBuildHead( settings, side )
 		settings.aoFooter = detected;
 	}
 
-	// ARIA role for the rows
-	$(target).children('tr').attr('role', 'row');
-
 	// Every cell needs to be passed through the renderer
 	$(target).children('tr').children('th, td')
 		.each( function () {
@@ -5187,7 +5183,7 @@ function _fnScrollDraw ( settings )
 		// browser support
 		var firstTr = null;
 
-		for (i=0 ; i<settings.aiDisplay.length ; i++) {
+		for (i=settings._iDisplayStart ; i<settings.aiDisplay.length ; i++) {
 			var idx = settings.aiDisplay[i];
 			var tr = settings.aoData[idx].nTr;
 
@@ -5355,11 +5351,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
@@ -7661,7 +7653,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
@@ -9656,7 +9648,7 @@ _api_register( 'ready()', function ( fn ) {
 			fn.call(this);
 		}
 		else {
-			this.on('init', function () {
+			this.on('init.dt.DT', function () {
 				fn.call(this);
 			});
 		}
@@ -9809,7 +9801,7 @@ _api_register( 'i18n()', function ( token, def, plural ) {
  *  @type string
  *  @default Version number
  */
-DataTable.version = "2.1.6";
+DataTable.version = "2.1.8";
 
 /**
  * Private data store, containing all of the settings objects that are
@@ -12134,7 +12126,7 @@ function __mlHelper (localeString) {
 
 		// 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.
-		if (! DataTable.ext.type.order[typeName]) {
+		if (! DataTable.ext.type.order[typeName + '-pre']) {
 			DataTable.type(typeName, {
 				detect: function (d) {
 					// The renderer will give the value to type detect as the type!
@@ -12373,7 +12365,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'],
@@ -12391,10 +12383,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) {
@@ -12457,13 +12449,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
@@ -13177,15 +13169,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];
@@ -13464,14 +13458,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.6",
+    "version": "2.1.8",
     "files": [
         "js/**/*.js",
         "js/**/*.mjs",

package/types/types.d.ts

@@ -3064,7 +3064,7 @@ interface FunctionColumnData {
     (row: any, type: 'display' | 'sort' | 'filter' | 'type', s: undefined, meta: CellMetaSettings): any;
 }
 
-interface ObjectColumnData {
+export interface ObjectColumnData {
     _: string | number | FunctionColumnData;
     filter?: string | number | FunctionColumnData;
     display?: string | number | FunctionColumnData;
@@ -3072,7 +3072,7 @@ interface ObjectColumnData {
     sort?: string | number | FunctionColumnData;
 }
 
-interface ObjectColumnRender {
+export interface ObjectColumnRender {
     _?: string | number | FunctionColumnRender;
     filter?: string | number | FunctionColumnRender;
     display?: string | number | FunctionColumnRender;