datatables.net 1.13.3 → 1.13.5

package/js/jquery.dataTables.mjs

@@ -1,16 +1,22 @@
-/*! DataTables 1.13.3
+/*! DataTables 1.13.5
  * ©2008-2023 SpryMedia Ltd - datatables.net/license
  */
 
 import jQuery from 'jquery';
 
 // DataTables code uses $ internally, but we want to be able to
-// reassign $ with the `use` method below, so it is a regular var.
-let $ = jQuery;
+// reassign $ with the `use` method, so it is a regular var.
+var $ = jQuery;
 
 
 var DataTable = function ( selector, options )
 {
+	// Check if called with a window or jQuery object for DOM less applications
+	// This is for backwards compatibility
+	if (DataTable.factory(selector, options)) {
+		return DataTable;
+	}
+
 	// When creating with `new`, create a new DataTable, returning the API instance
 	if (this instanceof DataTable) {
 		return $(selector).DataTable(options);
@@ -1115,6 +1121,7 @@ var DataTable = function ( selector, options )
 							type:   sort !== null   ? i+'.@data-'+sort   : undefined,
 							filter: filter !== null ? i+'.@data-'+filter : undefined
 						};
+						col._isArrayHost = true;
 		
 						_fnColumnOptions( oSettings, i );
 					}
@@ -1320,7 +1327,7 @@ var _numToDecimal = function ( num, decimalPoint ) {
 
 
 var _isNumber = function ( d, decimalPoint, formatted ) {
-	let type = typeof d;
+	var type = typeof d;
 	var strType = type === 'string';
 
 	if ( type === 'number' || type === 'bigint') {
@@ -1454,7 +1461,9 @@ var _removeEmpty = function ( a )
 
 
 var _stripHtml = function ( d ) {
-	return d.replace( _re_html, '' );
+	return d
+		.replace( _re_html, '' ) // Complete tags
+		.replace(/<script/i, ''); // Safety for incomplete script tag
 };
 
 
@@ -1828,7 +1837,10 @@ DataTable.util = {
 							continue;
 						}
 	
-						if ( data === null || data[ a[i] ] === undefined ) {
+						if (data === null || data[ a[i] ] === null) {
+							return null;
+						}
+						else if ( data === undefined || data[ a[i] ] === undefined ) {
 							return undefined;
 						}
 
@@ -2303,7 +2315,7 @@ function _fnColumnOptions( oSettings, iCol, oOptions )
 
 	// Indicate if DataTables should read DOM data as an object or array
 	// Used in _fnGetRowElements
-	if ( typeof mDataSrc !== 'number' ) {
+	if ( typeof mDataSrc !== 'number' && ! oCol._isArrayHost ) {
 		oSettings._rowReadObject = true;
 	}
 
@@ -3999,11 +4011,16 @@ function _fnAjaxUpdate( settings )
 	settings.iDraw++;
 	_fnProcessingDisplay( settings, true );
 
+	// Keep track of drawHold state to handle scrolling after the Ajax call
+	var drawHold = settings._drawHold;
+
 	_fnBuildAjax(
 		settings,
 		_fnAjaxParameters( settings ),
 		function(json) {
+			settings._drawHold = drawHold;
 			_fnAjaxUpdateDraw( settings, json );
+			settings._drawHold = false;
 		}
 	);
 }
@@ -4267,7 +4284,7 @@ function _fnFeatureHtmlFilter ( settings )
 				_fnThrottle( searchFn, searchDelay ) :
 				searchFn
 		)
-		.on( 'mouseup', function(e) {
+		.on( 'mouseup.DT', function(e) {
 			// Edge fix! Edge 17 does not trigger anything other than mouse events when clicking
 			// on the clear icon (Edge bug 17584515). This is safe in other browsers as `searchFn`
 			// checks the value to see if it has changed. In other browsers it won't have.
@@ -4333,7 +4350,7 @@ function _fnFilterComplete ( oSettings, oInput, iForce )
 	if ( _fnDataSource( oSettings ) != 'ssp' )
 	{
 		/* Global filter */
-		_fnFilter( oSettings, oInput.sSearch, iForce, fnRegex(oInput), oInput.bSmart, oInput.bCaseInsensitive, oInput.return );
+		_fnFilter( oSettings, oInput.sSearch, iForce, fnRegex(oInput), oInput.bSmart, oInput.bCaseInsensitive );
 		fnSaveFilter( oInput );
 
 		/* Now do the individual column filter */
@@ -4502,11 +4519,15 @@ function _fnFilterCreateSearch( search, regex, smart, caseInsensitive )
 		 * 
 		 * ^(?=.*?\bone\b)(?=.*?\btwo three\b)(?=.*?\bfour\b).*$
 		 */
-		var a = $.map( search.match( /"[^"]+"|[^ ]+/g ) || [''], function ( word ) {
+		var a = $.map( search.match( /["\u201C][^"\u201D]+["\u201D]|[^ ]+/g ) || [''], function ( word ) {
 			if ( word.charAt(0) === '"' ) {
 				var m = word.match( /^"(.*)"$/ );
 				word = m ? m[1] : word;
 			}
+			else if ( word.charAt(0) === '\u201C' ) {
+				var m = word.match( /^\u201C(.*)\u201D$/ );
+				word = m ? m[1] : word;
+			}
 
 			return word.replace('"', '');
 		} );
@@ -9306,6 +9327,52 @@ _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) {
+		$ = module;
+	}
+	else if (type == 'win' || module.document) {
+		window = module;
+		document = module.document;
+	}
+	else if (type === 'datetime' || module.type === 'DateTime') {
+		DataTable.DateTime = module;
+	}
+}
+
+/**
+ * CommonJS factory function pass through. This will check if the arguments
+ * given are a window object or a jQuery object. If so they are set
+ * accordingly.
+ * @param {*} root Window
+ * @param {*} jq jQUery
+ * @returns {boolean} Indicator
+ */
+DataTable.factory = function (root, jq) {
+	var is = false;
+
+	// Test if the first parameter is a window object
+	if (root && root.document) {
+		window = root;
+		document = root.document;
+	}
+
+	// Test if the second parameter is a jQuery object
+	if (jq && jq.fn && jq.fn.jquery) {
+		$ = jq;
+		is = true;
+	}
+
+	return is;
+}
+
 /**
  * Provide a common method for plug-ins to check the version of DataTables being
  * used, in order to ensure compatibility.
@@ -9637,7 +9704,9 @@ _api_register( 'i18n()', function ( token, def, plural ) {
 			resolved._;
 	}
 
-	return resolved.replace( '%d', plural ); // nb: plural might be undefined,
+	return typeof resolved === 'string'
+		? resolved.replace( '%d', plural ) // nb: plural might be undefined,
+		: resolved;
 } );
 /**
  * Version string for plug-ins to check compatibility. Allowed format is
@@ -9647,7 +9716,7 @@ _api_register( 'i18n()', function ( token, def, plural ) {
  *  @type string
  *  @default Version number
  */
-DataTable.version = "1.13.3";
+DataTable.version = "1.13.5";
 
 /**
  * Private data store, containing all of the settings objects that are
@@ -14789,7 +14858,7 @@ $.extend( true, DataTable.ext.renderer, {
 									'aria-controls': settings.sTableId,
 									'aria-disabled': disabled ? 'true' : null,
 									'aria-label': aria[ button ],
-									'aria-role': 'link',
+									'role': 'link',
 									'aria-current': btnClass === classes.sPageButtonActive ? 'page' : null,
 									'data-dt-idx': button,
 									'tabindex': tabIndex,
@@ -14923,7 +14992,7 @@ var __numericReplace = function ( d, decimalPlace, re1, re2 ) {
 		return -Infinity;
 	}
 	
-	let type = typeof d;
+	var type = typeof d;
 
 	if (type === 'number' || type === 'bigint') {
 		return d;
@@ -15297,7 +15366,7 @@ function __mlHelper (localeString) {
 var __thousands = ',';
 var __decimal = '.';
 
-if (Intl) {
+if (window.Intl !== undefined) {
 	try {
 		var num = new Intl.NumberFormat().formatToParts(100000.1);
 	
@@ -15576,13 +15645,4 @@ $.each( DataTable, function ( prop, val ) {
 	$.fn.DataTable[ prop ] = val;
 } );
 
-DataTable.use = function (module, type) {
-	if (type === 'lib' || module.fn) {
-		$ = module;
-	}
-	else if (type == 'win' || module.document) {
-		window = module;
-	}
-}
-
 export default DataTable;

package/package.json

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

package/types/types.d.ts

@@ -79,6 +79,12 @@ declare interface DataTables<T> extends DataTablesStatic {
         selector: InstSelector,
         opts?: Config
     ): Api<T>
+
+    /**
+     * CommonJS factory. This only applies to CommonJS environments,
+     * in all others it would throw an error.
+     */
+    (win?: Window, jQuery?: JQuery): DataTables<T>;
 }
 
 declare const DataTables: DataTables<any>;
@@ -97,12 +103,20 @@ interface JQueryDataTables extends JQuery {
 
 // Extend the jQuery object with DataTables' construction methods
 declare global {
+    interface JQueryDataTableApi extends DataTablesStatic {
+        <T = any>(opts?: Config): Api<T>;
+    }
+
+    interface JQueryDataTableJq extends DataTablesStatic {
+        (opts?: Config): JQueryDataTables;
+    }
+
     interface JQuery {
         /**
          * Create a new DataTable, returning a DataTables API instance.
          * @param opts Configuration settings
          */
-        DataTable<T = any>(opts?: Config): Api<T>;
+        DataTable: JQueryDataTableApi;
 
         /**
          * Create a new DataTable, returning a jQuery object, extended
@@ -110,7 +124,7 @@ declare global {
          * DataTables API.
          * @param opts Configuration settings
          */
-        dataTable(opts?: Config): JQueryDataTables;
+        dataTable: JQueryDataTableJq;
     }
 }
 
@@ -575,8 +589,6 @@ export interface ConfigSearch {
  */
 
 export interface Api<T> {
-    new(context: any, data: any[]);
-
     /**
      * API should be array-like
      */
@@ -1707,7 +1719,7 @@ export interface ApiRowChildMethods<T> {
      * @param showRemove This parameter can be given as true or false
      * @returns DataTables Api instance.
      */
-    (showRemove: boolean): RowChildMethods<T> | Api<T>;
+    (showRemove: boolean): RowChildMethods<T>;
 
     /**
      * Set the data to show in the child row(s). Note that calling this method will replace any child rows which are already attached to the parent row.
@@ -1716,7 +1728,7 @@ export interface ApiRowChildMethods<T> {
      * @param className Class name that is added to the td cell node(s) of the child row(s). As of 1.10.1 it is also added to the tr row node of the child row(s).
      * @returns DataTables Api instance
      */
-    (data: (string | Node | JQuery) | Array<(string | number | JQuery)>, className?: string): RowChildMethods<T> | Api<T>;
+    (data: (string | Node | JQuery) | Array<(string | number | JQuery)>, className?: string): RowChildMethods<T>;
 
     /**
      * Hide the child row(s) of a parent row
@@ -2113,10 +2125,10 @@ export interface ApiStatic {
      * Create a new API instance to an existing DataTable. Note that this
      * does not create a new DataTable.
      */
-    new (selector: string | Node | Node[] | JQuery): Api<any>;
+    new (selector: string | Node | Node[] | JQuery | InternalSettings): Api<any>;
 
     register<T=any>(name: string, fn: Function): T;
-    registerPlural<T=any>(name: string, fn: Function): T;
+    registerPlural<T=any>(pluralName: string, singleName: string, fn: Function): T;
 }
 
 export interface OrderFixed {