Merge branch 'hoRacy-master'

realrashid · Jun 15, 2024 · 9d6ede2 · 9d6ede2
2 parents 0d830db + 4fc3678
commit 9d6ede2
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 29 deletions.
diff --git a/resources/views/alert.blade.php b/resources/views/alert.blade.php
@@ -1,4 +1,4 @@
-@if (Session::has('alert.config') || Session::has('alert.delete'))
+@if (config('sweetalert.alwaysLoadJS') === true || Session::has('alert.config') || Session::has('alert.delete'))
     @if (config('sweetalert.animation.enable'))
         <link rel="stylesheet" href="{{ config('sweetalert.animatecss') }}">
     @endif
@@ -7,34 +7,36 @@
         <link href="https://cdn.jsdelivr.net/npm/@sweetalert2/theme-{{ config('sweetalert.theme') }}" rel="stylesheet">
     @endif
 
-    @if (config('sweetalert.alwaysLoadJS') === true && config('sweetalert.neverLoadJS') === false)
+    @if (config('sweetalert.neverLoadJS') === false)
         <script src="{{ $cdn ?? asset('vendor/sweetalert/sweetalert.all.js') }}"></script>
     @endif
 
-    <script>
-        @if (Session::has('alert.delete'))
-            document.addEventListener('click', function(event) {
-                if (event.target.matches('[data-confirm-delete]')) {
-                    event.preventDefault();
-                    Swal.fire({!! Session::pull('alert.delete') !!}).then(function(result) {
-                        if (result.isConfirmed) {
-                            var form = document.createElement('form');
-                            form.action = event.target.href;
-                            form.method = 'POST';
-                            form.innerHTML = `
-                    @csrf
-                    @method('DELETE')
-                `;
-                            document.body.appendChild(form);
-                            form.submit();
-                        }
-                    });
-                }
-            });
-        @endif
+    @if (Session::has('alert.delete') || Session::has('alert.config'))
+        <script>
+            @if (Session::has('alert.delete'))
+                document.addEventListener('click', function(event) {
+                    if (event.target.matches('[data-confirm-delete]')) {
+                        event.preventDefault();
+                        Swal.fire({!! Session::pull('alert.delete') !!}).then(function(result) {
+                            if (result.isConfirmed) {
+                                var form = document.createElement('form');
+                                form.action = event.target.href;
+                                form.method = 'POST';
+                                form.innerHTML = `
+                            @csrf
+                                @method('DELETE')
+                                `;
+                                document.body.appendChild(form);
+                                form.submit();
+                            }
+                        });
+                    }
+                });
+            @endif
 
-        @if (Session::has('alert.config'))
-            Swal.fire({!! Session::pull('alert.config') !!});
-        @endif
-    </script>
+            @if (Session::has('alert.config'))
+                Swal.fire({!! Session::pull('alert.config') !!});
+            @endif
+        </script>
+    @endif
 @endif
diff --git a/src/config/sweetalert.php b/src/config/sweetalert.php
@@ -45,8 +45,6 @@
     | If you want to handle the sweet alert js package by yourself
     | (for eg. you might want to use laravel mix) then this can be
     | handy.
-    | If you set always load js to true & never load js to false,
-    | it's going to prioritize the never load js.
     |
     | alwaysLoadJs = true  & neverLoadJs = true  => js will not be loaded
     | alwaysLoadJs = true  & neverLoadJs = false => js will be loaded