Skip to content

Commit

Permalink
fdc8a7fe754ee1d45685dfa9382355a8f34bf111 Revert DataTables/DataTables…
Browse files Browse the repository at this point in the history
…Src@3c4df03

Sync to source repo @fdc8a7fe754ee1d45685dfa9382355a8f34bf111
  • Loading branch information
dtbuild committed Sep 16, 2024
1 parent 50f7f82 commit 59277de
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 21 deletions.
2 changes: 1 addition & 1 deletion datatables.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
],
"src-repo": "http://github.com/DataTables/DataTablesSrc",
"last-tag": "2.1.6",
"last-sync": "dc6281cf1d880c48904bf6d445a021a5936001bb"
"last-sync": "fdc8a7fe754ee1d45685dfa9382355a8f34bf111"
}
10 changes: 1 addition & 9 deletions js/dataTables.js
Original file line number Diff line number Diff line change
Expand Up @@ -2157,11 +2157,7 @@
for (var i=0 ; i<cols.length ; i++) {
var width = _fnColumnsSumWidth(settings, [i], false, false);

// Need to set the min-width, otherwise the browser might try to collapse
// it further
cols[i].colEl
.css('width', width)
.css('min-width', width);
cols[i].colEl.css('width', width);
}
}

Expand Down Expand Up @@ -5408,11 +5404,7 @@
var width = _fnColumnsSumWidth( settings, this, true, false );

if ( width ) {
// Need to set the width and min-width, otherwise the browser
// will attempt to collapse the table beyond want might have
// been specified
this.style.width = width;
this.style.minWidth = width;

// For scrollX we need to force the column width otherwise the
// browser will collapse it. If this width is smaller than the
Expand Down
2 changes: 1 addition & 1 deletion js/dataTables.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/dataTables.min.mjs

Large diffs are not rendered by default.

10 changes: 1 addition & 9 deletions js/dataTables.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2104,11 +2104,7 @@ function _fnColumnSizes ( settings )
for (var i=0 ; i<cols.length ; i++) {
var width = _fnColumnsSumWidth(settings, [i], false, false);

// Need to set the min-width, otherwise the browser might try to collapse
// it further
cols[i].colEl
.css('width', width)
.css('min-width', width);
cols[i].colEl.css('width', width);
}
}

Expand Down Expand Up @@ -5355,11 +5351,7 @@ function _fnCalculateColumnWidths ( settings )
var width = _fnColumnsSumWidth( settings, this, true, false );

if ( width ) {
// Need to set the width and min-width, otherwise the browser
// will attempt to collapse the table beyond want might have
// been specified
this.style.width = width;
this.style.minWidth = width;

// For scrollX we need to force the column width otherwise the
// browser will collapse it. If this width is smaller than the
Expand Down

0 comments on commit 59277de

Please sign in to comment.