Skip to content

Commit

Permalink
31f2488df2fac6a551a657109c4484fb470401ef Fix: null in a column that…
Browse files Browse the repository at this point in the history
… is detected as a string with a diacritic would throw a JS error when sorting.

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

83082b39ab4ae5912d1221b9df04ae5f21593997 Merge branch 'master' of github.com:DataTables/DataTablesSrc

8c7e8da4da1435627f8eb1881c0db897db28b55a Docs: Tweak to `column().search()` docs

Sync to source repo @8c7e8da4da1435627f8eb1881c0db897db28b55a
  • Loading branch information
dtbuild committed Sep 20, 2024
1 parent 1cb130d commit 6be1438
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 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": "f181926d2ebcb27e3b8004964235d37891778950"
"last-sync": "8c7e8da4da1435627f8eb1881c0db897db28b55a"
}
4 changes: 2 additions & 2 deletions js/dataTables.js
Original file line number Diff line number Diff line change
Expand Up @@ -12510,8 +12510,8 @@
};

var __diacriticSort = function (a, b) {
a = a.toString().toLowerCase();
b = b.toString().toLowerCase();
a = a !== null && a !== undefined ? a.toString().toLowerCase() : '';
b = b !== null && b !== undefined ? b.toString().toLowerCase() : '';

// Checked for `navigator.languages` support in `oneOf` so this code can't execute in old
// Safari and thus can disable this check
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.

4 changes: 2 additions & 2 deletions js/dataTables.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -12457,8 +12457,8 @@ DataTable.types = function () {
};

var __diacriticSort = function (a, b) {
a = a.toString().toLowerCase();
b = b.toString().toLowerCase();
a = a !== null && a !== undefined ? a.toString().toLowerCase() : '';
b = b !== null && b !== undefined ? b.toString().toLowerCase() : '';

// Checked for `navigator.languages` support in `oneOf` so this code can't execute in old
// Safari and thus can disable this check
Expand Down

0 comments on commit 6be1438

Please sign in to comment.