Skip to content

Commit 848c020

Browse files
authored
Merge pull request #341 from FriendsOfCake/js-error
Fix JS error
2 parents ff5f8ee + eeda797 commit 848c020

File tree

2 files changed

+7
-19
lines changed

2 files changed

+7
-19
lines changed

config/asset_compress.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
[crudview.css]
22
files[]=https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css
33
files[]=https://cdn.jsdelivr.net/npm/[email protected]/dist/flatpickr.min.css
4-
files[]=https://cdn.jsdelivr.net/npm/[email protected]/dist/css/select2.min.css
4+
files[]=https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css
55
files[]=https://cdn.jsdelivr.net/npm/[email protected]/dist/select2-bootstrap-5-theme.min.css
66
files[]=plugin:CrudView:css/local.css
77

88
[crudview_head.js]
99
files[]=https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.min.js
10-
files[]=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js
10+
files[]=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js
1111
files[]=https://cdn.jsdelivr.net/npm/[email protected]
12-
files[]=https://cdn.jsdelivr.net/npm/select2@4.0
12+
files[]=https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js
1313
files[]=https://cdn.jsdelivr.net/npm/[email protected]/jquery.dirtyforms.min.js
1414

1515
[crudview.js]

webroot/js/local.js

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var CrudView = {
2020
select2: function (selector) {
2121
$(selector).each(function () {
2222
var $this = $(this),
23-
config = {theme: 'bootstrap4'};
23+
config = {theme: 'bootstrap-5'};
2424

2525
if (!$this.prop('multiple') && $this.find('option:first').val() === '') {
2626
config.allowClear = true;
@@ -36,7 +36,7 @@ var CrudView = {
3636
var $ele = $(ele);
3737

3838
$ele.select2({
39-
theme: 'bootstrap4',
39+
theme: 'bootstrap-5',
4040
minimumInputLength: 1,
4141
ajax: {
4242
delay: 250,
@@ -82,20 +82,9 @@ var CrudView = {
8282
$('form[data-dirty-check=1]').dirtyForms();
8383
},
8484

85-
dropdown: function () {
86-
$('.dropdown-toggle').dropdown();
87-
88-
// recommended hack to get dropdowns correctly work inside responsive table
89-
$('.table-responsive').on('show.bs.dropdown', function () {
90-
$('.table-responsive').css( "overflow", "inherit" );
91-
});
92-
$('.table-responsive').on('hide.bs.dropdown', function () {
93-
$('.table-responsive').css( "overflow", "auto" );
94-
})
95-
},
96-
9785
tooltip: function () {
98-
$('[data-toggle="tooltip"]').tooltip();
86+
const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]')
87+
const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl));
9988
},
10089

10190
initialize: function () {
@@ -104,7 +93,6 @@ var CrudView = {
10493
this.select2('select[multiple]:not(.no-select2), select.select2');
10594
this.autocomplete('input.autocomplete, select.autocomplete');
10695
this.dirtyForms();
107-
this.dropdown();
10896
this.tooltip();
10997
}
11098
};

0 commit comments

Comments
 (0)