21a716b9ea8cb4262c8dab39e9cb28e3337711e3 Dev: Correcting checks for a…

…ppling a minWidth Sync to source repo @21a716b9ea8cb4262c8dab39e9cb28e3337711e3
DataTables · Oct 16, 2024 · 7e04a80 · 7e04a80
1 parent 7336100
commit 7e04a80
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 23 deletions.
diff --git a/datatables.json b/datatables.json
@@ -11,5 +11,5 @@
     ],
     "src-repo": "http://github.com/DataTables/DataTablesSrc",
     "last-tag": "2.1.8",
-    "last-sync": "3ae6f7f30c6119f2a47d57095ab6fef609d0c19a"
+    "last-sync": "21a716b9ea8cb4262c8dab39e9cb28e3337711e3"
 }
diff --git a/js/dataTables.js b/js/dataTables.js
@@ -5252,17 +5252,10 @@
 
 			if (firstTr) {
 				var colSizes = $(firstTr).children('th, td').map(function (vis) {
-					var outerWidth = $(this).outerWidth();
-					var ret = {
+					return {
 						idx: _fnVisibleToColumnIndex(settings, vis),
-						width: outerWidth
+						width: $(this).outerWidth()
 					};
-
-					if (scrollX) {
-						ret.minWidth = outerWidth;
-					}
-
-					return ret;
 				});
 
 				// Check against what the colgroup > col is set to and correct if needed
@@ -5273,7 +5266,7 @@
 					if (colWidth !== colSizes[i].width) {
 						colEl.style.width = colSizes[i].width + 'px';
 
-						if (scrollX) {
+						if (scroll.sX) {
 							colEl.style.minWidth = colSizes[i].width + 'px';
 						}
 					}

diff --git a/js/dataTables.min.js b/js/dataTables.min.js
diff --git a/js/dataTables.min.mjs b/js/dataTables.min.mjs
diff --git a/js/dataTables.mjs b/js/dataTables.mjs
@@ -5199,17 +5199,10 @@ function _fnScrollDraw ( settings )
 
 		if (firstTr) {
 			var colSizes = $(firstTr).children('th, td').map(function (vis) {
-				var outerWidth = $(this).outerWidth();
-				var ret = {
+				return {
 					idx: _fnVisibleToColumnIndex(settings, vis),
-					width: outerWidth
+					width: $(this).outerWidth()
 				};
-
-				if (scrollX) {
-					ret.minWidth = outerWidth;
-				}
-
-				return ret;
 			});
 
 			// Check against what the colgroup > col is set to and correct if needed
@@ -5220,7 +5213,7 @@ function _fnScrollDraw ( settings )
 				if (colWidth !== colSizes[i].width) {
 					colEl.style.width = colSizes[i].width + 'px';
 
-					if (scrollX) {
+					if (scroll.sX) {
 						colEl.style.minWidth = colSizes[i].width + 'px';
 					}
 				}