951e0eb8c0065557f29fd79141479d0263d02d05 Fix: Tables with borders wou…

…ld overflow when scrolling was enabled https://datatables.net/forums/discussion/80424 Sync to source repo @951e0eb8c0065557f29fd79141479d0263d02d05
DataTables · Jan 9, 2025 · 2a5e16e · 2a5e16e
1 parent c53b82b
commit 2a5e16e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/datatables.json b/datatables.json
@@ -11,5 +11,5 @@
     ],
     "src-repo": "http://github.com/DataTables/DataTablesSrc",
     "last-tag": "2.2.0",
-    "last-sync": "c23b0484f8dcdd99930365dacd061940ab98f182"
+    "last-sync": "951e0eb8c0065557f29fd79141479d0263d02d05"
 }
diff --git a/js/dataTables.js b/js/dataTables.js
@@ -5485,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

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
@@ -5450,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