wait #7674 @3

diff --git a/app/Console/Commands/UpdatePDFJSLibrary.php b/app/Console/Commands/UpdatePDFJSLibrary.php
index 7a9ae3468216a5b783626e7a2ac8a42fe1ff48c8..74ea810c80ad3baa35ec8fb0c20aa82ec8ef1679 100644 (file)
--- a/app/Console/Commands/UpdatePDFJSLibrary.php
+++ b/app/Console/Commands/UpdatePDFJSLibrary.php
@@ -35,7 +35,7 @@ class UpdatePDFJSLibrary extends ToolboxCommand
         copy('https://github.com/mozilla/pdf.js/releases/download/v' . static::VERSION . '/pdfjs-' . static::VERSION . ($legacy ? '-legacy' : '') . '-dist.zip', $tmp);
         Zip::extract($tmp, $path);
         unlink($tmp);
-        copy('https://code.jquery.com/jquery-3.6.4.min.js', $path . '/web/jquery.min.js');
+        copy('https://code.jquery.com/jquery-3.7.1.min.js', $path . '/web/jquery.min.js');
         touch($path . '/web/custom.js');
 
         $html = file_get_contents($path . '/web/viewer.html');

diff --git a/config/backpack/base.php b/config/backpack/base.php
index c0147e2044b8c2b7eba02c90450a7ced8716bd7f..98943ed3a59c4e7b3c50c8440d220f088947b857 100644 (file)
--- a/config/backpack/base.php
+++ b/config/backpack/base.php
@@ -56,10 +56,10 @@ return [
         'packages/fluidbook/toolbox/css/style.css',
         'packages/fluidbook/toolbox/css/loader.css',
 
-        'https://cdnjs.cloudflare.com/ajax/libs/jquery-contextmenu/2.9.2/jquery.contextMenu.min.css',
-        'https://cdnjs.cloudflare.com/ajax/libs/sweetalert2/11.7.3/sweetalert2.min.css',
-        'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css',
-        'https://cdnjs.cloudflare.com/ajax/libs/select2-bootstrap-theme/0.1.0-beta.10/select2-bootstrap.min.css',
+        '/cdnproxy/cdnjs.cloudflare.com/ajax/libs/jquery-contextmenu/2.9.2/jquery.contextMenu.min.css',
+        '/cdnproxy/cdnjs.cloudflare.com/ajax/libs/sweetalert2/11.7.3/sweetalert2.min.css',
+        '/cdnproxy/cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css',
+        '/cdnproxy/cdnjs.cloudflare.com/ajax/libs/select2-bootstrap-theme/0.1.0-beta.10/select2-bootstrap.min.css',
 
         // Here's what's inside the bundle:
         // 'packages/@digitallyhappy/backstrap/css/style.min.css',
@@ -150,13 +150,13 @@ return [
         'packages/fluidbook/toolbox/js/bundle.js',
         'packages/fluidbook/toolbox/js/contextdownload.js',
 
-        'https://cdnjs.cloudflare.com/ajax/libs/jquery.form/4.3.0/jquery.form.min.js',
-        "https://cdnjs.cloudflare.com/ajax/libs/jquery-contextmenu/2.9.2/jquery.contextMenu.min.js",
-        "https://cdnjs.cloudflare.com/ajax/libs/jquery-contextmenu/2.9.2/jquery.ui.position.min.js",
-        'https://cdnjs.cloudflare.com/ajax/libs/gsap/3.12.5/gsap.min.js',
-        'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js',
-        'https://cdnjs.cloudflare.com/ajax/libs/sweetalert2/11.10.5/sweetalert2.all.js',
-        'https://unpkg.com/@lottiefiles/lottie-player@latest/dist/lottie-player.js',
+        '/cdnproxy/cdnjs.cloudflare.com/ajax/libs/jquery.form/4.3.0/jquery.form.min.js',
+        "/cdnproxy/cdnjs.cloudflare.com/ajax/libs/jquery-contextmenu/2.9.2/jquery.contextMenu.min.js",
+        "/cdnproxy/cdnjs.cloudflare.com/ajax/libs/jquery-contextmenu/2.9.2/jquery.ui.position.min.js",
+        '/cdnproxy/cdnjs.cloudflare.com/ajax/libs/gsap/3.12.5/gsap.min.js',
+        '/cdnproxy/cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js',
+        '/cdnproxy/cdnjs.cloudflare.com/ajax/libs/sweetalert2/11.10.5/sweetalert2.all.js',
+        '/cdnproxy/unpkg.com/@lottiefiles/lottie-player@latest/dist/lottie-player.js',
 
         // examples (everything inside the bundle, loaded from CDN)
         // 'https://code.jquery.com/jquery-3.4.1.min.js',

diff --git a/package-lock.json b/package-lock.json
index c0e2cf0d38c61a92318b30e8cb0c092791f9b892..382dd353a44b1c0d4ec0a8e5b0b5f9397f28fed6 100644 (file)
--- a/package-lock.json
+++ b/package-lock.json
@@ -44,7 +44,7 @@
                 "axios": "^1.3.5",
                 "cross-env": "^7.0.3",
                 "gsap": "npm:@gsap/business@^3.12.3",
-                "jquery": "^3.6.4",
+                "jquery": "^3.7.1",
                 "laravel-mix": "^6.0.49",
                 "resolve-url-loader": "^5.0.0",
                 "sass": "^1.62.0",

diff --git a/package.json b/package.json
index c2e7f2153ede79d6e7b4ddb2ea98bf569dd616d5..1edf4e346028494be0bf06c76cbbd1ace0509793 100644 (file)
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
         "axios": "^1.8.4",
         "cross-env": "^7.0.3",
         "gsap": "npm:@gsap/business@^3.12.3",
-        "jquery": "^3.6.4",
+        "jquery": "^3.7.1",
         "laravel-mix": "^6.0.49",
         "resolve-url-loader": "^5.0.0",
         "sass": "^1.62.0",

diff --git a/resources/views/fields/fluidbook_composition.blade.php b/resources/views/fields/fluidbook_composition.blade.php
index eb12ab7497b8d66003ce11a9daa01140585125cd..6ab261c930b7a395ebac63659feb7891f8163dd3 100644 (file)
--- a/resources/views/fields/fluidbook_composition.blade.php
+++ b/resources/views/fields/fluidbook_composition.blade.php
@@ -707,7 +707,7 @@
         <script src="/cdnproxy/cdnjs.cloudflare.com/ajax/libs/Sortable/1.15.0/Sortable.min.js"></script>
         <script src="/cdnproxy/cdnjs.cloudflare.com/ajax/libs/keypress/2.1.5/keypress.min.js"></script>
         <script src="/cdnproxy/cdnjs.cloudflare.com/ajax/libs/gsap/3.10.4/gsap.min.js"></script>
-
+    @endpush
     @push('crud_fields_styles')
         <link rel="stylesheet"
               href="/cdnproxy/cdnjs.cloudflare.com/ajax/libs/jquery-contextmenu/2.9.2/jquery.contextMenu.min.css"/>

diff --git a/resources/views/vendor/backpack/crud/form_content.blade.php b/resources/views/vendor/backpack/crud/form_content.blade.php
index c27391ff2c7115c067f7d78765789c96b685fd6f..b7dbb1467b2cd40b9c9c13e7d83b58090d18d180 100644 (file)
--- a/resources/views/vendor/backpack/crud/form_content.blade.php
+++ b/resources/views/vendor/backpack/crud/form_content.blade.php
@@ -12,7 +12,7 @@
 @else
     <div class="card">
         <div class="card-body row">
-            @include('crud::inc.show_fields', ['fields' => $crud->fields()])
+            @include('crud::inc.show_fields', ['fields' =>$crud->fields()])
         </div>
     </div>
 @endif