Skip to content

Commit

Permalink
9133e2fe5dfb092e2f644c915f3755f1f6ef3e8e Fix: When server-side proces…
Browse files Browse the repository at this point in the history
…sing is enabled, the columns could go out of alignment when paging

https://datatables.net/forums/discussion/80187

9274f7a1abf8eed68f0182bf56fd70fcbf4d6daf Merge branch 'master' of github.com:DataTables/DataTablesSrc

Sync to source repo @9274f7a1abf8eed68f0182bf56fd70fcbf4d6daf
  • Loading branch information
dtbuild committed Nov 8, 2024
1 parent 6ab301a commit 07c3973
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 5 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.8",
"last-sync": "7d5c19aa5a5b8e859ae3539cc20accadbce53829"
"last-sync": "9274f7a1abf8eed68f0182bf56fd70fcbf4d6daf"
}
5 changes: 4 additions & 1 deletion js/dataTables.js
Original file line number Diff line number Diff line change
Expand Up @@ -5239,8 +5239,11 @@
// [].find, but it wasn't supported in Chrome until Sept 2015, and DT has 10 year
// browser support
var firstTr = null;
var start = _fnDataSource( settings ) !== 'ssp'
? settings._iDisplayStart
: 0;

for (i=settings._iDisplayStart ; i<settings.aiDisplay.length ; i++) {
for (i=start ; i<start + settings.aiDisplay.length ; i++) {
var idx = settings.aiDisplay[i];
var tr = settings.aoData[idx].nTr;

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.

5 changes: 4 additions & 1 deletion js/dataTables.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -5186,8 +5186,11 @@ function _fnScrollDraw ( settings )
// [].find, but it wasn't supported in Chrome until Sept 2015, and DT has 10 year
// browser support
var firstTr = null;
var start = _fnDataSource( settings ) !== 'ssp'
? settings._iDisplayStart
: 0;

for (i=settings._iDisplayStart ; i<settings.aiDisplay.length ; i++) {
for (i=start ; i<start + settings.aiDisplay.length ; i++) {
var idx = settings.aiDisplay[i];
var tr = settings.aoData[idx].nTr;

Expand Down

0 comments on commit 07c3973

Please sign in to comment.