Merge pull request #342 from FriendsOfCake/feat/js

Fix error for optional JS features
FriendsOfCake · Nov 29, 2024 · 82c58db · 82c58db
2 parents 21af8d0 + 9d84026
commit 82c58db
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/config/asset_compress.ini b/config/asset_compress.ini
@@ -10,7 +10,7 @@ files[]=https://cdn.jsdelivr.net/npm/[email protected]/dist/jquery.min.js
 files[]=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js
 files[]=https://cdn.jsdelivr.net/npm/[email protected]
 files[]=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/select2.min.js
-files[]=https://cdn.jsdelivr.net/npm/[email protected]/jquery.dirtyforms.min.js
+files[]=https://cdn.jsdelivr.net/npm/[email protected]
 
 [crudview.js]
 files[]=plugin:CrudView:js/local.js
diff --git a/webroot/js/local.js b/webroot/js/local.js
@@ -14,7 +14,9 @@ var CrudView = {
     },
 
     flatpickr: function (selector) {
-        $(selector).flatpickr();
+        if ($.flatpickr) {
+            $(selector).flatpickr();
+        }
     },
 
     select2: function (selector) {
@@ -78,8 +80,10 @@ var CrudView = {
     },
 
     dirtyForms: function () {
-        $.DirtyForms.dialog = false;
-        $('form[data-dirty-check=1]').dirtyForms();
+        if ($.DirtyForms) {
+            $.DirtyForms.dialog = false;
+            $('form[data-dirty-check=1]').dirtyForms();
+        }
     },
 
     dropdown: function () {