datatables.net 2.0.2 → 2.0.3

package/js/dataTables.mjs

@@ -1,4 +1,4 @@
-/*! DataTables 2.0.2
+/*! DataTables 2.0.3
  * © SpryMedia Ltd - datatables.net/license
  */
 
@@ -3364,8 +3364,15 @@ function _fnDraw( oSettings, ajaxComplete )
 	_fnCallbackFire( oSettings, 'aoFooterCallback', 'footer', [ $(oSettings.nTFoot).children('tr')[0],
 		_fnGetDataMaster( oSettings ), iDisplayStart, iDisplayEnd, aiDisplay ] );
 
-	body.children().detach();
-	body.append( $(anRows) );
+	// replaceChildren is faster, but only became widespread in 2020,
+	// so a fall back in jQuery is provided for older browsers.
+	if (body[0].replaceChildren) {
+		body[0].replaceChildren.apply(body[0], anRows);
+	}
+	else {
+		body.children().detach();
+		body.append( $(anRows) );
+	}
 
 	// Empty table needs a specific class
 	$(oSettings.nTableWrapper).toggleClass('dt-empty-footer', $('tr', oSettings.nTFoot).length === 0);
@@ -3633,15 +3640,15 @@ function _fnAddOptionsHtml ( settings )
 
 	settings.nTableWrapper = insert[0];
 
-	var top = _layoutArray( settings, settings.layout, 'top' );
-	var bottom = _layoutArray( settings, settings.layout, 'bottom' );
-	var renderer = _fnRenderer( settings, 'layout' );
-
 	if (settings.sDom) {
 		// Legacy
 		_fnLayoutDom(settings, settings.sDom, insert);
 	}
 	else {
+		var top = _layoutArray( settings, settings.layout, 'top' );
+		var bottom = _layoutArray( settings, settings.layout, 'bottom' );
+		var renderer = _fnRenderer( settings, 'layout' );
+	
 		// Everything above - the renderer will actually insert the contents into the document
 		top.forEach(function (item) {
 			renderer( settings, insert, item );
@@ -5401,10 +5408,13 @@ function _fnSortAttachListener(settings, node, selector, column, callback) {
 				// Allow the processing display to show
 				setTimeout( function () {
 					_fnSort( settings );
-					_fnSortDisplay( settings );
-					_fnReDraw( settings, false, false );
+					_fnSortDisplay( settings, settings.aiDisplay );
+
+					// Sort processing done - redraw has its own processing display
 					_fnProcessingDisplay( settings, false );
 
+					_fnReDraw( settings, false, false );
+
 					if (callback) {
 						callback();
 					}
@@ -5418,8 +5428,7 @@ function _fnSortAttachListener(settings, node, selector, column, callback) {
  * Sort the display array to match the master's order
  * @param {*} settings
  */
-function _fnSortDisplay(settings) {
-	var display = settings.aiDisplay;
+function _fnSortDisplay(settings, display) {
 	var master = settings.aiDisplayMaster;
 	var masterMap = {};
 	var map = {};
@@ -7640,11 +7649,7 @@ var __row_selector = function ( settings, selector, opts )
 	var matched = _selector_run( 'row', selector, run, settings, opts );
 
 	if (opts.order === 'current' || opts.order === 'applied') {
-		var master = settings.aiDisplayMaster;
-
-		matched.sort(function(a, b) {  
-			return master.indexOf(a) - master.indexOf(b);
-		});
+		_fnSortDisplay(settings, matched);
 	}
 
 	return matched;
@@ -9505,7 +9510,7 @@ _api_register( 'i18n()', function ( token, def, plural ) {
  *  @type string
  *  @default Version number
  */
-DataTable.version = "2.0.2";
+DataTable.version = "2.0.3";
 
 /**
  * Private data store, containing all of the settings objects that are
@@ -12907,9 +12912,9 @@ $.extend( true, DataTable.ext.renderer, {
 				var ariaType = '';
 				var indexes = columns.indexes();
 				var sortDirs = columns.orderable(true).flatten();
-				var orderedColumns = sorting.map( function (val) {
+				var orderedColumns = ',' + sorting.map( function (val) {
 					return val.col;
-				} ).join(',');
+				} ).join(',') + ',';
 
 				cell
 					.removeClass(
@@ -12920,7 +12925,7 @@ $.extend( true, DataTable.ext.renderer, {
 					.toggleClass( orderClasses.canAsc, orderable && sortDirs.includes('asc') )
 					.toggleClass( orderClasses.canDesc, orderable && sortDirs.includes('desc') );
 				
-				var sortIdx = orderedColumns.indexOf( indexes.toArray().join(',') );
+				var sortIdx = orderedColumns.indexOf( ',' + indexes.toArray().join(',') + ',' );
 
 				if ( sortIdx !== -1 ) {
 					// Get the ordering direction for the columns under this cell
@@ -12935,7 +12940,7 @@ $.extend( true, DataTable.ext.renderer, {
 				}
 
 				// The ARIA spec says that only one column should be marked with aria-sort
-				if ( sortIdx === 0 && orderedColumns.length === indexes.count() ) {
+				if ( sortIdx === 0 ) {
 					var firstSort = sorting[0];
 					var sortOrder = col.asSorting;
 

package/package.json

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

package/types/types.d.ts

@@ -1593,7 +1593,7 @@ export interface ApiCell<T> {
     (rowSelector: RowSelector<T>, columnSelector: ColumnSelector, modifier?: ApiSelectorModifier): ApiCellMethods<T>;
 }
 
-export interface ApiCellMethods<T> extends Omit<Api<T>, 'render'> {
+export interface ApiCellMethods<T> extends Omit<Api<T>, 'render' | 'select'> {
     /**
      * Get the DataTables cached data for the selected cell
      *
@@ -1677,7 +1677,7 @@ export interface ApiCells<T> {
     (rowSelector: RowSelector<T>, columnSelector: ColumnSelector, modifier?: ApiSelectorModifier): ApiCellsMethods<T>;
 }
 
-export interface ApiCellsMethods<T> extends Omit<Api<T>, 'data' | 'render'> {
+export interface ApiCellsMethods<T> extends Omit<Api<T>, 'data' | 'render' | 'select'> {
     /**
      * Get the DataTables cached data for the selected cells
      *
@@ -2312,7 +2312,7 @@ export interface ApiRow<T> {
     add(data: any[] | object): ApiRowMethods<T>;
 }
 
-export interface ApiRowMethods<T> extends Omit<Api<T>, 'data'> {
+export interface ApiRowMethods<T> extends Omit<Api<T>, 'data' | 'select'> {
     /**
      * Get the DataTables cached data for the selected row(s)
      *
@@ -2406,7 +2406,7 @@ export interface ApiRows<T> {
     add(data: T[]): ApiRowsMethods<T>;
 }
 
-export interface ApiRowsMethods<T> extends Api<T> {
+export interface ApiRowsMethods<T> extends Omit<Api<T>, 'select'> {
     /**
      * Get the DataTables cached data for the selected row(s)
      *
@@ -3004,182 +3004,137 @@ export interface DataTablesStaticExtButtons {
  * that these all use legacy Hungarian notation.
  */
  export interface ExtClassesSettings {
-    /**
-     * Default Value:
-     * dataTable
-     */
-    sTable?: string;
-
-    /**
-     * Default Value:
-     * no-footer
-     */
-    sNoFooter?: string;
-
-    /**
-     * Default Value:
-     * dt-paging-button
-     */
-    sPageButton?: string;
-
-    /**
-     * Default Value:
-     * current
-     */
-    sPageButtonActive?: string;
-
-    /**
-     * Default Value:
-     * disabled
-     */
-    sPageButtonDisabled?: string;
-
-    /**
-     * Default Value:
-     * odd
-     */
-    sStripeOdd?: string;
-
-    /**
-     * Default Value:
-     * even
-     */
-    sStripeEven?: string;
-
-    /**
-     * Default Value:
-     * dt-empty
-     */
-    sRowEmpty?: string;
-
-    /**
-     * Default Value:
-     * dt-container
-     */
-    sWrapper?: string;
-
-    /**
-     * Default Value:
-     * dt-search
-     */
-    sFilter?: string;
-
-    /**
-     * Default Value:
-     * dt-info
-     */
-    sInfo?: string;
-
-    /**
-     * Default Value:
-     * dt-paging paging_
-     */
-    sPaging?: string;
-
-    /**
-     * Default Value:
-     * dt-length
-     */
-    sLength?: string;
-
-    /**
-     * Default Value:
-     * dt-processing
-     */
-    sProcessing?: string;
-
-    /**
-     * Default Value:
-     * sorting_asc
-     */
-    sSortAsc?: string;
-
-    /**
-     * Default Value:
-     * sorting_desc
-     */
-    sSortDesc?: string;
-
-    /**
-     * Default Value:
-     * sorting
-     */
-    sSortable?: string;
-
-    /**
-     * Default Value:
-     * sorting_asc_disabled
-     */
-    sSortableAsc?: string;
-
-    /**
-     * Default Value:
-     * sorting_desc_disabled
-     */
-    sSortableDesc?: string;
-
-    /**
-     * Default Value:
-     * sorting_disabled
-     */
-    sSortableNone?: string;
-
-    /**
-     * Default Value:
-     * sorting_
-     */
-    sSortColumn?: string;
-
-    sFilterInput?: string;
-    sLengthSelect?: string;
-
-    /**
-     * Default Value:
-     * dataTables_scroll
-     */
-    sScrollWrapper?: string;
-
-    /**
-     * Default Value:
-     * dt-scroll-head
-     */
-    sScrollHead?: string;
-
-    /**
-     * Default Value:
-     * dt-scroll-headInner
-     */
-    sScrollHeadInner?: string;
-
-    /**
-     * Default Value:
-     * dt-scroll-body
-     */
-    sScrollBody?: string;
-
-    /**
-     * Default Value:
-     * dt-scroll-foot
-     */
-    sScrollFoot?: string;
-
-    /**
-     * Default Value:
-     * dt-scroll-footInner
-     */
-    sScrollFootInner?: string;
-
-    sHeaderTH?: string;
-    sFooterTH?: string;
-    sSortJUIAsc?: string;
-    sSortJUIDesc?: string;
-    sSortJUI?: string;
-    sSortJUIAscAllowed?: string;
-    sSortJUIDescAllowed?: string;
-    sSortJUIWrapper?: string;
-    sSortIcon?: string;
-    sJUIHeader?: string;
-    sJUIFooter?: string;
+    /** Class to apply to the container for all DataTables controlled elements */
+	container: string;
+
+    /** Empty row classes */
+	empty: {
+        /** Empty row class */
+		row: string;
+	};
+
+    /** Info feature classes */
+	info: {
+        /** Container `<div>` class */
+		container: string;
+	};
+
+    /** Length feature classes */
+	length: {
+        /** Container `<div>` class */
+		container: string;
+
+        /** Applied to the `<select>` element */
+		select: string;
+	};
+
+    /** Table header cell ordering classes */
+	order: {
+        /** Applied if a column can sort asc */
+		canAsc: string;
+
+        /** Applied if a column can sort desc */
+		canDesc: string;
+
+        /** Applied if a column is sorting asc */
+		isAsc: string;
+
+        /** Applied if a column is sorting desc */
+		isDesc: string;
+
+        /** Applied if there is no sorting available on a column */
+		none: string;
+
+        /** Position class */
+		position: string;
+	};
+
+    /** Processing indicator classes */
+	processing: {
+        /** Container `<div>` class */
+		container: string;
+	};
+
+    /** Classes for scrolling tables (`scrollX` / `scrollY`) */
+	scrolling: {
+        /** Body table wrapper `<div>` */
+		body: string;
+
+        /** Applied to the wrapper for all scrolling elements */
+		container: string;
+
+        /** Scrolling footer classes */
+		footer: {
+            /** Applied to the footer container `<div>` */
+			self: string;
+
+            /** Applied to the inner footer `<div>` */
+			inner: string;
+		};
+
+        /** Scrolling header classes */
+		header: {
+            /** Applied to the header container `<div>` */
+			self: string;
+
+            /** Applied to the inner header `<div>` */
+			inner: string;
+		}
+	};
+
+    /** Search feature classes */
+	search: {
+        /** Applied to the search container `<div>` */
+		container: string;
+
+        /** Class to add to `<input>` element */
+		input: string;
+	};
+
+    /** Class to add to the `<table>` when DataTables is initialised on it */
+	table: string;
+
+    /** Table body classes */
+	tbody: {
+        /** Applied to all cells in the table body */
+		cell: string;
+
+        /** Applied to all `tr` element in the table body */
+		row: string;
+	};
+
+    /** Table header classes */
+	thead: {
+        /** Applied to `td`/`th` elements in the table header */
+		cell: string;
+
+        /** Applied to `tr` elements in the table header */
+		row: string;
+	};
+
+    /** Table footer classes */
+	tfoot: {
+        /** Applied to `td`/`th` elements in the footer */
+		cell: string;
+
+        /** Applied to `tr` elements in the footer */
+		row: string;
+	};
+
+    /** Paging feature classes */
+	paging: {
+        /** Button shows the current page */
+		active: string;
+
+        /** Applied to all buttons */
+		button: string;
+
+        /** Container class */
+		container: string;
+
+        /** Button unavailable class */
+		disabled: string;
+	};
 }