From 52b4f5c26dae74041a95ee165bd4553baa52d455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Alfaiate?= Date: Tue, 12 Nov 2024 14:27:06 +0700 Subject: [PATCH 1/4] Upgrade to DataTables 2 --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 49cb286..361afc9 100644 --- a/package.json +++ b/package.json @@ -30,10 +30,10 @@ "dependencies": { "bootstrap": "^5.2.2", "bootstrap-icons": "^1.9.1", - "datatables.net": "^1.12.1", - "datatables.net-bs5": "^1.12.1", - "datatables.net-buttons-bs5": "^2.2.3", - "datatables.net-select-bs5": "^1.4.0", + "datatables.net": "^2.1.8", + "datatables.net-bs5": "^2.1.8", + "datatables.net-buttons-bs5": "^3.1.2", + "datatables.net-select-bs5": "^2.1.0", "jquery": "^3.6.1" } } From 1078813b33377229ac6b4e14c7a6dce3c64002f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Alfaiate?= Date: Tue, 12 Nov 2024 14:38:27 +0700 Subject: [PATCH 2/4] Fix liner default config --- js/index.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/js/index.js b/js/index.js index d09a59a..8998d74 100644 --- a/js/index.js +++ b/js/index.js @@ -22,8 +22,10 @@ $.extend(true, DataTable.defaults, { $.extend(true, DataTable.Buttons.defaults, { dom: { - buttonLiner: { - tag: '' + button: { + liner: { + tag: "" + } }, }, }); From e79745ba0c6ed1c3f0b8f62dd8681ba39c62d0ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Alfaiate?= Date: Tue, 12 Nov 2024 14:38:38 +0700 Subject: [PATCH 3/4] Fix README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0274407..eb8c1c9 100644 --- a/README.md +++ b/README.md @@ -17,10 +17,10 @@ import 'laravel-datatables-vite'; Add the following to your `resources/sass/app.scss` file: ```css -@import 'bootstrap-icons/font/bootstrap-icons.css'; +@import "bootstrap-icons/font/bootstrap-icons.min.css"; @import "datatables.net-bs5/css/dataTables.bootstrap5.min.css"; @import "datatables.net-buttons-bs5/css/buttons.bootstrap5.min.css"; -@import 'datatables.net-select-bs5/css/select.bootstrap5.css'; +@import "datatables.net-select-bs5/css/select.bootstrap5.min.css"; ``` ## Quick Starter From c64b650a80d50bc0dc208dcc9a7bfb64343e872d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Alfaiate?= Date: Tue, 12 Nov 2024 14:55:51 +0700 Subject: [PATCH 4/4] Remove dom default config --- js/index.js | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/js/index.js b/js/index.js index 8998d74..f3acfbd 100644 --- a/js/index.js +++ b/js/index.js @@ -1,7 +1,7 @@ import $ from 'jquery'; +window.jQuery = window.$ = $; -import * as Bootstrap from 'bootstrap' -window.jQuery = window.$ = $ +import * as Bootstrap from 'bootstrap'; window.bootstrap = Bootstrap; import DataTable from 'datatables.net-bs5'; @@ -12,14 +12,6 @@ import 'datatables.net-select-bs5'; import './dataTables.buttons.js'; import './dataTables.renderers.js'; -$.extend(true, DataTable.defaults, { - dom: - "<'row'<'col-sm-12 mb-4'B>>" + - "<'row'<'col-sm-12 col-md-6'l><'col-sm-12 col-md-6'f>>" + - "<'row'<'col-sm-12'tr>>" + - "<'row'<'col-sm-12 col-md-5'i><'col-sm-12 col-md-7'p>>", -}); - $.extend(true, DataTable.Buttons.defaults, { dom: { button: {