datatables.net 2.2.0 → 2.2.2

package/js/dataTables.mjs

@@ -1,4 +1,4 @@
-/*! DataTables 2.2.0
+/*! DataTables 2.2.2
  * © SpryMedia Ltd - datatables.net/license
  */
 
@@ -5315,6 +5315,14 @@ function _fnCalculateColumnWidths ( settings )
 		i, column, columnIdx;
 		
 	var styleWidth = table.style.width;
+	var containerWidth = _fnWrapperWidth(settings);
+
+	// Don't re-run for the same width as the last time
+	if (containerWidth === settings.containerWidth) {
+		return false;
+	}
+
+	settings.containerWidth = containerWidth;
 
 	// If there is no width applied as a CSS style or as an attribute, we assume that
 	// the width is intended to be 100%, which is usually is in CSS, but it is very
@@ -5442,15 +5450,15 @@ function _fnCalculateColumnWidths ( settings )
 
 		// If there is no width attribute or style, then allow the table to
 		// collapse
-		if ( tmpTable.width() < tableContainer.clientWidth && tableWidthAttr ) {
-			tmpTable.width( tableContainer.clientWidth );
+		if ( tmpTable.outerWidth() < tableContainer.clientWidth && tableWidthAttr ) {
+			tmpTable.outerWidth( tableContainer.clientWidth );
 		}
 	}
 	else if ( scrollY ) {
-		tmpTable.width( tableContainer.clientWidth );
+		tmpTable.outerWidth( tableContainer.clientWidth );
 	}
 	else if ( tableWidthAttr ) {
-		tmpTable.width( tableWidthAttr );
+		tmpTable.outerWidth( tableWidthAttr );
 	}
 
 	// Get the width of each column in the constructed table
@@ -5483,47 +5491,43 @@ function _fnCalculateColumnWidths ( settings )
 	}
 
 	if ( (tableWidthAttr || scrollX) && ! settings._reszEvt ) {
-		var wrapperWidth = function () {
-			return $(settings.nTableWrapper).is(':visible')
-				? $(settings.nTableWrapper).width()
-				: 0;
-		}
-
-		settings.containerWidth = wrapperWidth();
-
 		var resize = DataTable.util.throttle( function () {
-			var newWidth = wrapperWidth();
+			var newWidth = _fnWrapperWidth(settings);
 
-			// Don't do it if destroying, is the same size as last time, or the container
-			// width is 0
-			if (
-				! settings.bDestroying &&
-				settings.containerWidth !== newWidth &&
-				newWidth !== 0
-			) {
-				// Do a resize
+			// Don't do it if destroying or the container width is 0
+			if (! settings.bDestroying && newWidth !== 0) {
 				_fnAdjustColumnSizing( settings );
-				settings.containerWidth = newWidth;
 			}
 		} );
 
 		// For browsers that support it (~2020 onwards for wide support) we can watch for the
 		// container changing width.
 		if (window.ResizeObserver) {
-			settings.resizeObserver = new ResizeObserver(function (e) {
-				var box = e[0].contentBoxSize;
-				var size = Array.isArray(box)
-					? box[0].inlineSize // Spec
-					: box.inlineSize; // Old Firefox
+			// This is a tricky beast - if the element is visible when `.observe()` is called,
+			// then the callback is immediately run. Which we don't want. If the element isn't
+			// visible, then it isn't run, but we want it to run when it is then made visible.
+			// This flag allows the above to be satisfied.
+			var first = $(settings.nTableWrapper).is(':visible');
+
+			// Use an empty div to attach the observer so it isn't impacted by height changes
+			var resizer = $('<div>')
+				.css({
+					width: '100%',
+					height: 0
+				})
+				.addClass('dt-autosize')
+				.appendTo(settings.nTableWrapper);
 
-				// Under this condition a resize will trigger its own resize, causing an error.
-				if (size < settings.containerWidth) {
-					return;
+			settings.resizeObserver = new ResizeObserver(function (e) {
+				if (first) {
+					first = false;
+				}
+				else {
+					resize();
 				}
-
-				resize();
 			});
-			settings.resizeObserver.observe(settings.nTableWrapper);
+
+			settings.resizeObserver.observe(resizer[0]);
 		}
 		else {
 			// For old browsers, the best we can do is listen for a window resize
@@ -5534,6 +5538,17 @@ function _fnCalculateColumnWidths ( settings )
 	}
 }
 
+/**
+ * Get the width of the DataTables wrapper element
+ *
+ * @param {*} settings DataTables settings object
+ * @returns Width
+ */
+function _fnWrapperWidth(settings) {
+	return $(settings.nTableWrapper).is(':visible')
+		? $(settings.nTableWrapper).width()
+		: 0;
+}
 
 /**
  * Get the maximum strlen for each data column
@@ -5844,10 +5859,14 @@ function _fnSort ( oSettings, col, dir )
 		displayMaster = oSettings.aiDisplayMaster,
 		aSort;
 
+	// Make sure the columns all have types defined
+	_fnColumnTypes(oSettings);
+
 	// Allow a specific column to be sorted, which will _not_ alter the display
 	// master
 	if (col !== undefined) {
 		var srcCol = oSettings.aoColumns[col];
+
 		aSort = [{
 			src:       col,
 			col:       col,
@@ -8896,6 +8915,10 @@ _api_registerPlural( 'columns().indexes()', 'column().index()', function ( type
 
 _api_register( 'columns.adjust()', function () {
 	return this.iterator( 'table', function ( settings ) {
+		// Force a column sizing to happen with a manual call - otherwise it can skip
+		// if the size hasn't changed
+		settings.containerWidth = -1;
+
 		_fnAdjustColumnSizing( settings );
 	}, 1 );
 } );
@@ -9787,12 +9810,14 @@ _api_register( 'ready()', function ( fn ) {
 	// Function to run either once the table becomes ready or
 	// immediately if it is already ready.
 	return this.tables().every(function () {
+		var api = this;
+
 		if (this.context[0]._bInitComplete) {
-			fn.call(this);
+			fn.call(api);
 		}
 		else {
 			this.on('init.dt.DT', function () {
-				fn.call(this);
+				fn.call(api);
 			});
 		}
 	} );
@@ -9848,20 +9873,37 @@ _api_register( 'destroy()', function ( remove ) {
 			jqTable.append( tfoot );
 		}
 
+		// Clean up the header
+		$(thead).find('span.dt-column-order').remove();
+		$(thead).find('span.dt-column-title').each(function () {
+			var title = $(this).html();
+			$(this).parent().append(title);
+			$(this).remove();
+		});
+
 		settings.colgroup.remove();
 
 		settings.aaSorting = [];
 		settings.aaSortingFixed = [];
 		_fnSortingClasses( settings );
 
+		$(jqTable).find('th, td').removeClass(
+			$.map(DataTable.ext.type.className, function (v) {
+				return v;
+			}).join(' ')
+		);
+
 		$('th, td', thead)
 			.removeClass(
+				orderClasses.none + ' ' +
 				orderClasses.canAsc + ' ' +
 				orderClasses.canDesc + ' ' +
 				orderClasses.isAsc + ' ' +
 				orderClasses.isDesc
 			)
-			.css('width', '');
+			.css('width', '')
+			.removeAttr('data-dt-column')
+			.removeAttr('aria-sort');
 
 		// Add the TR elements back into the table in their original order
 		jqTbody.children().detach();
@@ -9949,7 +9991,7 @@ _api_register( 'i18n()', function ( token, def, plural ) {
  *  @type string
  *  @default Version number
  */
-DataTable.version = "2.2.0";
+DataTable.version = "2.2.2";
 
 /**
  * Private data store, containing all of the settings objects that are
@@ -12058,7 +12100,7 @@ DataTable.models.oSettings = {
 	resizeObserver: null,
 
 	/** Keep a record of the last size of the container, so we can skip duplicates */
-	containerWidth: 0
+	containerWidth: -1
 };
 
 /**
@@ -12990,16 +13032,16 @@ $.extend( true, DataTable.ext.renderer, {
 					cell.removeAttr('aria-sort');
 				}
 
-				cell.attr('aria-label', orderable
-					? col.ariaTitle + ctx.api.i18n('oAria.orderable' + ariaType)
-					: col.ariaTitle
-				);
-
 				// Make the headers tab-able for keyboard navigation
 				if (orderable) {
 					var orderSpan = cell.find('.dt-column-order');
 					
-					orderSpan.attr('role', 'button');
+					orderSpan
+						.attr('role', 'button')
+						.attr('aria-label', orderable
+							? col.ariaTitle + ctx.api.i18n('oAria.orderable' + ariaType)
+							: col.ariaTitle
+						);
 
 					if (tabIndex !== -1) {
 						orderSpan.attr('tabindex', tabIndex);

package/package.json

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