diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2024-10-30 11:36:01 +0000 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2024-10-30 11:36:01 +0000 |
| commit | 2342bacd006740235a2ce44445bc7c1b16f38a39 (patch) | |
| tree | be13b18bcc5256fca91d67e708159c4b12110629 /resources/js | |
| parent | 7669805ac24d9515a765901f31a0cdd11c265725 (diff) | |
| download | webtrees-2342bacd006740235a2ce44445bc7c1b16f38a39.tar.gz webtrees-2342bacd006740235a2ce44445bc7c1b16f38a39.tar.bz2 webtrees-2342bacd006740235a2ce44445bc7c1b16f38a39.zip | |
Fix: #4964 - upgrade datatables to V2
Diffstat (limited to 'resources/js')
| -rw-r--r-- | resources/js/vendor.js | 4 | ||||
| -rw-r--r-- | resources/js/webtrees.js | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/resources/js/vendor.js b/resources/js/vendor.js index e78717ed95..de09f19f85 100644 --- a/resources/js/vendor.js +++ b/resources/js/vendor.js @@ -32,8 +32,6 @@ window.bootstrap = { Tooltip: Tooltip, }; -import 'datatables.net'; - // Just import the subset of icons that we use in resources/views/icons/ import { dom, library } from '@fortawesome/fontawesome-svg-core'; import { @@ -56,7 +54,9 @@ import { } from '@fortawesome/free-solid-svg-icons'; import 'corejs-typeahead'; +import DataTable from 'datatables.net'; import 'datatables.net-bs5'; +window.DataTable = DataTable; import Sortable from 'sortablejs'; diff --git a/resources/js/webtrees.js b/resources/js/webtrees.js index 535cac4d5b..3e68b335e9 100644 --- a/resources/js/webtrees.js +++ b/resources/js/webtrees.js @@ -941,9 +941,9 @@ $(function () { }; // DataTables - start hidden to prevent FOUC. - $('table.datatables').each(function () { - $(this).DataTable(); - $(this).removeClass('d-none'); + document.querySelectorAll('table.datatables').forEach(function (element) { + new DataTable(element); + element.classList.remove('d-none'); }); // Save button/checkbox state between pages |