Skip to content

Commit

Permalink
7521d6f2bd98de2cde2e82dff82230c180eee722 Fix: Don't check colspan of …
Browse files Browse the repository at this point in the history
…child rows for non-auto generated rows

* Remove the function that overwrites the children td colspan when already has colspan

* Revert "Remove the function that overwrites the children td colspan when already has colspan"

This reverts commit cf6a21e438be0854a44acbbba60661be33f9d1c7.

* Add verification that checks if children row has only one td before overwriting the existing colspan

Sync to source repo @7521d6f2bd98de2cde2e82dff82230c180eee722
  • Loading branch information
AllanJard committed Nov 16, 2023
1 parent 16f4ccd commit 09717cb
Show file tree
Hide file tree
Showing 5 changed files with 15 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": "1.13.7",
"last-sync": "65c066c0f88839109f60aceb2de8482a48bd80d4"
"last-sync": "7521d6f2bd98de2cde2e82dff82230c180eee722"
}
7 changes: 6 additions & 1 deletion js/jquery.dataTables.js
Original file line number Diff line number Diff line change
Expand Up @@ -8583,7 +8583,12 @@
row = data[i];

if ( row._details ) {
row._details.children('td[colspan]').attr('colspan', visible );
row._details.each(function () {
var el = $(this);
if (el.children('td').length == 1) {
el.children('td[colspan]').attr('colspan', visible);
}
});
}
}
} );
Expand Down
2 changes: 1 addition & 1 deletion js/jquery.dataTables.min.js

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion js/jquery.dataTables.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -8526,7 +8526,12 @@ var __details_events = function ( settings )
row = data[i];

if ( row._details ) {
row._details.children('td[colspan]').attr('colspan', visible );
row._details.each(function () {
var el = $(this);
if (el.children('td').length == 1) {
el.children('td[colspan]').attr('colspan', visible);
}
});
}
}
} );
Expand Down

0 comments on commit 09717cb

Please sign in to comment.