@ntlab/ntjs-assets 2.17.0 → 2.19.0

package/assets/js/DataTables/DataTables/js/dataTables.js

@@ -1,4 +1,4 @@
-/*! DataTables 2.2.0
+/*! DataTables 2.2.1
  * © SpryMedia Ltd - datatables.net/license
  */
 
@@ -5350,6 +5350,14 @@
 			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
@@ -5477,15 +5485,15 @@
 	
 			// 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
@@ -5518,46 +5526,33 @@
 		}
 	
 		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');
 	
-					// 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);
 			}
 			else {
@@ -5569,6 +5564,17 @@
 		}
 	}
 	
+	/**
+	 * 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
@@ -8931,6 +8937,10 @@
 	
 	_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 );
 	} );
@@ -9984,7 +9994,7 @@
 	 *  @type string
 	 *  @default Version number
 	 */
-	DataTable.version = "2.2.0";
+	DataTable.version = "2.2.1";
 	
 	/**
 	 * Private data store, containing all of the settings objects that are
@@ -12093,7 +12103,7 @@
 		resizeObserver: null,
 	
 		/** Keep a record of the last size of the container, so we can skip duplicates */
-		containerWidth: 0
+		containerWidth: -1
 	};
 	
 	/**