Skip to content

Commit 82c58db

Browse files
authored
Merge pull request #342 from FriendsOfCake/feat/js
Fix error for optional JS features
2 parents 21af8d0 + 9d84026 commit 82c58db

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

config/asset_compress.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ files[]=https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.min.js
1010
files[]=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js
1111
files[]=https://cdn.jsdelivr.net/npm/[email protected]
1212
files[]=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/select2.min.js
13-
files[]=https://cdn.jsdelivr.net/npm/[email protected]/jquery.dirtyforms.min.js
13+
files[]=https://cdn.jsdelivr.net/npm/[email protected]
1414

1515
[crudview.js]
1616
files[]=plugin:CrudView:js/local.js

webroot/js/local.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ var CrudView = {
1414
},
1515

1616
flatpickr: function (selector) {
17-
$(selector).flatpickr();
17+
if ($.flatpickr) {
18+
$(selector).flatpickr();
19+
}
1820
},
1921

2022
select2: function (selector) {
@@ -78,8 +80,10 @@ var CrudView = {
7880
},
7981

8082
dirtyForms: function () {
81-
$.DirtyForms.dialog = false;
82-
$('form[data-dirty-check=1]').dirtyForms();
83+
if ($.DirtyForms) {
84+
$.DirtyForms.dialog = false;
85+
$('form[data-dirty-check=1]').dirtyForms();
86+
}
8387
},
8488

8589
dropdown: function () {

0 commit comments

Comments
 (0)