datatables.net 1.13.6 → 1.13.8

package/js/jquery.dataTables.mjs

@@ -1,4 +1,4 @@
-/*! DataTables 1.13.5
+/*! DataTables 1.13.7
  * ©2008-2023 SpryMedia Ltd - datatables.net/license
  */
 
@@ -1288,7 +1288,7 @@ var _re_date = /^\d{2,4}[\.\/\-]\d{1,2}[\.\/\-]\d{1,2}([T ]{1}\d{1,2}[:\.]\d{2}(
 // Escape regular expression special characters
 var _re_escape_regex = new RegExp( '(\\' + [ '/', '.', '*', '+', '?', '|', '(', ')', '[', ']', '{', '}', '\\', '$', '^', '-' ].join('|\\') + ')', 'g' );
 
-// http://en.wikipedia.org/wiki/Foreign_exchange_market
+// https://en.wikipedia.org/wiki/Foreign_exchange_market
 // - \u20BD - Russian ruble.
 // - \u20a9 - South Korean Won
 // - \u20BA - Turkish Lira
@@ -2287,6 +2287,12 @@ function _fnColumnOptions( oSettings, iCol, oOptions )
 			oCol.aDataSort = [ oOptions.iDataSort ];
 		}
 		_fnMap( oCol, oOptions, "aDataSort" );
+
+		// Fall back to the aria-label attribute on the table header if no ariaTitle is
+		// provided.
+		if (! oCol.ariaTitle) {
+			oCol.ariaTitle = th.attr("aria-label");
+		}
 	}
 
 	/* Cache the data get and set functions for speed */
@@ -4250,7 +4256,7 @@ function _fnFeatureHtmlFilter ( settings )
 		/* Update all other filter input elements for the new display */
 		var n = features.f;
 		var val = !this.value ? "" : this.value; // mental IE8 fix :-(
-		if(previousSearch.return && event.key !== "Enter") {
+		if(previousSearch['return'] && event.key !== "Enter") {
 			return;
 		}
 		/* Now do the filter */
@@ -4260,7 +4266,7 @@ function _fnFeatureHtmlFilter ( settings )
 				"bRegex": previousSearch.bRegex,
 				"bSmart": previousSearch.bSmart ,
 				"bCaseInsensitive": previousSearch.bCaseInsensitive,
-				"return": previousSearch.return
+				"return": previousSearch['return']
 			} );
 
 			// Need to redraw, without resorting
@@ -4335,7 +4341,7 @@ function _fnFilterComplete ( oSettings, oInput, iForce )
 		oPrevSearch.bRegex = oFilter.bRegex;
 		oPrevSearch.bSmart = oFilter.bSmart;
 		oPrevSearch.bCaseInsensitive = oFilter.bCaseInsensitive;
-		oPrevSearch.return = oFilter.return;
+		oPrevSearch['return'] = oFilter['return'];
 	};
 	var fnRegex = function ( o ) {
 		// Backwards compatibility with the bEscapeRegex option
@@ -4587,7 +4593,7 @@ function _fnFilterData ( settings )
 				// If it looks like there is an HTML entity in the string,
 				// attempt to decode it so sorting works as expected. Note that
 				// we could use a single line of jQuery to do this, but the DOM
-				// method used here is much faster http://jsperf.com/html-decode
+				// method used here is much faster https://jsperf.com/html-decode
 				if ( cellData.indexOf && cellData.indexOf('&') !== -1 ) {
 					__filter_div.innerHTML = cellData;
 					cellData = __filter_div_textContent ?
@@ -5612,11 +5618,13 @@ function _fnCalculateColumnWidths ( oSettings )
 	}
 
 	/* Convert any user input sizes into pixel sizes */
+	var sizes = _fnConvertToWidth(_pluck(columns, 'sWidthOrig'), tableContainer);
+
 	for ( i=0 ; i<visibleColumns.length ; i++ ) {
 		column = columns[ visibleColumns[i] ];
 
 		if ( column.sWidth !== null ) {
-			column.sWidth = _fnConvertToWidth( column.sWidthOrig, tableContainer );
+			column.sWidth = sizes[i];
 
 			userInputs = true;
 		}
@@ -5819,26 +5827,40 @@ var _fnThrottle = DataTable.util.throttle;
 
 
 /**
- * Convert a CSS unit width to pixels (e.g. 2em)
- *  @param {string} width width to be converted
+ * Convert a set of CSS units width to pixels (e.g. 2em)
+ *  @param {string[]} widths widths to be converted
  *  @param {node} parent parent to get the with for (required for relative widths) - optional
- *  @returns {int} width in pixels
+ *  @returns {int[]} widths in pixels
  *  @memberof DataTable#oApi
  */
-function _fnConvertToWidth ( width, parent )
+function _fnConvertToWidth ( widths, parent )
 {
-	if ( ! width ) {
-		return 0;
+	var els = [];
+	var results = [];
+
+	// Add the elements in a single loop so we only need to reflow once
+	for (var i=0 ; i<widths.length ; i++) {
+		if (widths[i]) {
+			els.push(
+				$('<div/>')
+					.css( 'width', _fnStringToCss( widths[i] ) )
+					.appendTo( parent || document.body )
+			)
+		}
+		else {
+			els.push(null);
+		}
 	}
 
-	var n = $('<div/>')
-		.css( 'width', _fnStringToCss( width ) )
-		.appendTo( parent || document.body );
+	// Get the sizes (will reflow once)
+	for (var i=0 ; i<widths.length ; i++) {
+		results.push(els[i] ? els[i][0].offsetWidth : null);
+	}
 
-	var val = n[0].offsetWidth;
-	n.remove();
+	// Tidy
+	$(els).remove();
 
-	return val;
+	return results;
 }
 
 
@@ -6573,7 +6595,7 @@ function _fnLog( settings, level, msg, tn )
 
 	if ( tn ) {
 		msg += '. For more information about this error, please see '+
-		'http://datatables.net/tn/'+tn;
+		'https://datatables.net/tn/'+tn;
 	}
 
 	if ( ! level  ) {
@@ -8504,7 +8526,13 @@ var __details_events = function ( settings )
 				row = data[i];
 
 				if ( row._details ) {
-					row._details.children('td[colspan]').attr('colspan', visible );
+					row._details.each(function () {
+						var el = $(this).children('td');
+
+						if (el.length == 1) {
+							el.attr('colspan', visible);
+						}
+					});
 				}
 			}
 		} );
@@ -9711,12 +9739,12 @@ _api_register( 'i18n()', function ( token, def, plural ) {
 /**
  * Version string for plug-ins to check compatibility. Allowed format is
  * `a.b.c-d` where: a:int, b:int, c:int, d:string(dev|beta|alpha). `d` is used
- * only for non-release builds. See http://semver.org/ for more information.
+ * only for non-release builds. See https://semver.org/ for more information.
  *  @member
  *  @type string
  *  @default Version number
  */
-DataTable.version = "1.13.5";
+DataTable.version = "1.13.7";
 
 /**
  * Private data store, containing all of the settings objects that are
@@ -10292,7 +10320,7 @@ DataTable.defaults = {
 	 * --------
 	 *
 	 * As an object, the parameters in the object are passed to
-	 * [jQuery.ajax](http://api.jquery.com/jQuery.ajax/) allowing fine control
+	 * [jQuery.ajax](https://api.jquery.com/jQuery.ajax/) allowing fine control
 	 * of the Ajax request. DataTables has a number of default parameters which
 	 * you can override using this option. Please refer to the jQuery
 	 * documentation for a full description of the options available, although
@@ -12000,7 +12028,7 @@ DataTable.defaults = {
 		 *    $(document).ready( function() {
 		 *      $('#example').dataTable( {
 		 *        "language": {
-		 *          "url": "http://www.sprymedia.co.uk/dataTables/lang.txt"
+		 *          "url": "https://www.sprymedia.co.uk/dataTables/lang.txt"
 		 *        }
 		 *      } );
 		 *    } );
@@ -14781,7 +14809,7 @@ $.extend( true, DataTable.ext.renderer, {
 			var btnDisplay, btnClass;
 
 			var attach = function( container, buttons ) {
-				var i, ien, node, button, tabIndex;
+				var i, ien, node, button;
 				var disabledClass = classes.sPageButtonDisabled;
 				var clickHandler = function ( e ) {
 					_fnPageChange( settings, e.data.action, true );
@@ -14796,9 +14824,10 @@ $.extend( true, DataTable.ext.renderer, {
 						attach( inner, button );
 					}
 					else {
+						var disabled = false;
+
 						btnDisplay = null;
 						btnClass = button;
-						tabIndex = settings.iTabIndex;
 
 						switch ( button ) {
 							case 'ellipsis':
@@ -14809,8 +14838,7 @@ $.extend( true, DataTable.ext.renderer, {
 								btnDisplay = lang.sFirst;
 
 								if ( page === 0 ) {
-									tabIndex = -1;
-									btnClass += ' ' + disabledClass;
+									disabled = true;
 								}
 								break;
 
@@ -14818,8 +14846,7 @@ $.extend( true, DataTable.ext.renderer, {
 								btnDisplay = lang.sPrevious;
 
 								if ( page === 0 ) {
-									tabIndex = -1;
-									btnClass += ' ' + disabledClass;
+									disabled = true;
 								}
 								break;
 
@@ -14827,8 +14854,7 @@ $.extend( true, DataTable.ext.renderer, {
 								btnDisplay = lang.sNext;
 
 								if ( pages === 0 || page === pages-1 ) {
-									tabIndex = -1;
-									btnClass += ' ' + disabledClass;
+									disabled = true;
 								}
 								break;
 
@@ -14836,8 +14862,7 @@ $.extend( true, DataTable.ext.renderer, {
 								btnDisplay = lang.sLast;
 
 								if ( pages === 0 || page === pages-1 ) {
-									tabIndex = -1;
-									btnClass += ' ' + disabledClass;
+									disabled = true;
 								}
 								break;
 
@@ -14850,8 +14875,10 @@ $.extend( true, DataTable.ext.renderer, {
 
 						if ( btnDisplay !== null ) {
 							var tag = settings.oInit.pagingTag || 'a';
-							var disabled = btnClass.indexOf(disabledClass) !== -1;
-		
+
+							if (disabled) {
+								btnClass += ' ' + disabledClass;
+							}
 
 							node = $('<'+tag+'>', {
 									'class': classes.sPageButton+' '+btnClass,
@@ -14861,7 +14888,7 @@ $.extend( true, DataTable.ext.renderer, {
 									'role': 'link',
 									'aria-current': btnClass === classes.sPageButtonActive ? 'page' : null,
 									'data-dt-idx': button,
-									'tabindex': tabIndex,
+									'tabindex': disabled ? -1 : settings.iTabIndex,
 									'id': idx === 0 && typeof button === 'string' ?
 										settings.sTableId +'_'+ button :
 										null
@@ -15078,7 +15105,7 @@ $.extend( _ext.type.order, {
 	// string
 	"string-pre": function ( a ) {
 		// This is a little complex, but faster than always calling toString,
-		// http://jsperf.com/tostring-v-check
+		// https://jsperf.com/tostring-v-check
 		return _empty(a) ?
 			'' :
 			typeof a === 'string' ?

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.6",
+    "version": "1.13.8",
     "files": [
         "js/**/*.js",
         "js/**/*.mjs",

package/types/types.d.ts

@@ -813,7 +813,17 @@ export interface Api<T> {
      * @param callback Specific callback function to remove if you want to unbind a single event listener.
      * @returns DataTables Api instance
      */
-    off(event: string, callback?: ((e: Event, ...args: any[]) => void)): Api<T>;
+    off(event: string, callback?: ((this: HTMLElement, e: Event, ...args: any[]) => void)): Api<T>;
+
+    /**
+     * Remove event handlers from selected elements
+     *
+     * @param event Event name to remove.
+     * @param selector Element selector
+     * @param callback Specific callback function to remove if you want to unbind a single event listener.
+     * @returns DataTables Api instance
+     */
+    off(event: string, selector: string, callback?: ((this: HTMLElement, e: Event, ...args: any[]) => void)): Api<T>;
 
     /**
      * Table events listener.
@@ -822,7 +832,17 @@ export interface Api<T> {
      * @param callback Specific callback function to remove if you want to unbind a single event listener.
      * @returns DataTables Api instance
      */
-    on(event: string, callback: ((e: Event, ...args: any[]) => void)): Api<T>;
+    on(event: string, callback: ((this: HTMLElement, e: Event, ...args: any[]) => void)): Api<T>;
+
+    /**
+     * Listen for events from selected elements
+     *
+     * @param event Event to listen for.
+     * @param selector Element selector
+     * @param callback Event handler.
+     * @returns DataTables Api instance
+     */
+    on(event: string, selector: string, callback: ((this: HTMLElement, e: Event, ...args: any[]) => void)): Api<T>;
 
     /**
      * Listen for a table event once and then remove the listener.
@@ -832,7 +852,17 @@ export interface Api<T> {
      * Listen for events from tables and fire a callback when they occur
      * @returns DataTables Api instance
      */
-    one(event: string, callback: ((e: Event, ...args: any[]) => void)): Api<T>;
+    one(event: string, callback: ((this: HTMLElement, e: Event, ...args: any[]) => void)): Api<T>;
+
+    /**
+     * Listen for events from a selected element and trigger only once then remove the listener.
+     *
+     * @param event Event to listen for.
+     * @param selector Element selector
+     * @param callback Event handler.
+     * @returns DataTables Api instance
+     */
+    one(event: string, selector: string, callback: ((this: HTMLElement, e: Event, ...args: any[]) => void)): Api<T>;
 
     /**
      * Page Methods / object
@@ -1798,7 +1828,7 @@ export interface ApiRow<T> {
      * @param data Data to use for the new row. This may be an array, object or Javascript object instance, but must be in the same format as the other data in the table+
      * @returns DataTables API instance with the newly added row in its result set.
      */
-    add(data: any[] | object): Api<Array<Array<any>>>;
+    add(data: any[] | object): ApiRowMethods<T>;
 }
 
 export interface ApiRowMethods<T> extends Omit<Api<T>, 'data'> {
@@ -1892,7 +1922,7 @@ export interface ApiRows<T> {
      * @param data Array of data elements, with each one describing a new row to be added to the table
      * @returns DataTables API instance with the newly added rows in its result set.
      */
-    add(data: T[]): Api<Array<any>>;
+    add(data: T[]): ApiRowsMethods<T>;
 }
 
 export interface ApiRowsMethods<T> extends Api<T> {