From aad92ff35292d2f0127b25ad8220b042716673fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= <jeremy.munsch@ldc.fr>
Date: Fri, 1 Apr 2022 15:18:29 +0200
Subject: [PATCH 1/2] Ticket 780 fix cancel on basket creation

---
 resources/js/components/media-manager/BasketComponent.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/media-manager/BasketComponent.vue b/resources/js/components/media-manager/BasketComponent.vue
index 910eb9e..4fb720d 100644
--- a/resources/js/components/media-manager/BasketComponent.vue
+++ b/resources/js/components/media-manager/BasketComponent.vue
@@ -228,8 +228,8 @@
                 let d = new Date();
                 let strDate = ("0" + d.getDate()).slice(-2) + "/" + ("0" + (d.getMonth() + 1)).slice(-2) + "/" + d.getFullYear();
                 let defaultTitle = "Panier du " + strDate;
-                let title = prompt("Indiquez le libellé de votre nouveau panier", defaultTitle);
-                if (title !== "") {
+                let title = prompt("Indiquez le libellé de votre nouveau panier", defaultTitle) ?? ''
+                if (title.length) {
                     this.$loading.show({delay:0});
                     axios.post('/ajax/add-basket', {
                         title: title,

From 73813051b1f395bf399efb5b1b93a6a616e92f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= <jeremy.munsch@ldc.fr>
Date: Mon, 4 Apr 2022 14:45:55 +0200
Subject: [PATCH 2/2] =?UTF-8?q?Ticket=20772:=20versionnage=20des=20assets?=
 =?UTF-8?q?=20compil=C3=A9=20mix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/layouts/app.blade.php   | 18 +++++++++---------
 resources/views/media_manager.blade.php |  8 ++++----
 webpack.mix.js                          |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 40e602a..0ab84f1 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -7,12 +7,12 @@
     <title>{{ config('app.name', 'Laravel') }}</title>
 
 	<!-- Styles -->
-    <link href="{{ asset('css/jquery.fancybox.min.css') }}" rel="stylesheet">
-    <link href="{{ asset('css/app.css') }}?ver=2.2" rel="stylesheet">
-    <link href="{{ asset('css/solid.css') }}?ver=1.0" rel="stylesheet">
-    <link href="{{ asset('css/brands.css') }}?ver=1.0" rel="stylesheet">
-    <link href="{{ asset('css/regular.css') }}?ver=1.0" rel="stylesheet">
-    <link href="{{ asset('css/fontawesome.css') }}?ver=1.0" rel="stylesheet">
+    <link href="{{ mix('css/jquery.fancybox.min.css') }}" rel="stylesheet">
+    <link href="{{ mix('css/app.css') }}" rel="stylesheet">
+    <link href="{{ mix('css/solid.css') }}" rel="stylesheet">
+    <link href="{{ mix('css/brands.css') }}" rel="stylesheet">
+    <link href="{{ mix('css/regular.css') }}" rel="stylesheet">
+    <link href="{{ mix('css/fontawesome.css') }}" rel="stylesheet">
 
     <!-- Global site tag (gtag.js) - Google Analytics -->
     <script async src="https://www.googletagmanager.com/gtag/js?id=UA-148734400-1"></script>
@@ -27,7 +27,7 @@
 
         gtag('config', 'UA-148734400-1');
     </script>
-    <script src="{{ asset('js/openseadragon.min.js') }}"></script>
+    <script src="{{ mix('js/openseadragon.min.js') }}"></script>
 </head>
 <body>
 <div id="vue-app" style="display: inline;">
@@ -62,8 +62,8 @@
 	@yield('media_edit')
 </div>
 	<!-- Scripts -->
-	<script src="{{ asset('js/jquery.fancybox.min.js') }}" defer></script>
-	<script src="{{ asset('js/app.js') }}?ver=2.2"></script>
+	<script src="{{ mix('js/jquery.fancybox.min.js') }}" defer></script>
+	<script src="{{ mix('js/app.js') }}"></script>
 	@yield('scripts')
 </body>
 </html>
diff --git a/resources/views/media_manager.blade.php b/resources/views/media_manager.blade.php
index decf220..9ec3d44 100644
--- a/resources/views/media_manager.blade.php
+++ b/resources/views/media_manager.blade.php
@@ -28,10 +28,10 @@
 @endsection
 @section('scripts')
     <!-- TODO : Faire le tri des js ci-dessous -->
-	<script src="{{ asset('js/jquery.nestable.min.js') }}" defer></script>
+	<script src="{{ mix('js/jquery.nestable.min.js') }}" defer></script>
 	<script src="{{ asset('js/uploadfile/vendor/jquery.ui.widget.js') }}"></script>
 	<script src="{{ asset('js/uploadfile/jquery.iframe-transport.js') }}"></script>
-	<script src="{{ asset('js/fabric.js') }}"></script>
-	<script src="{{ asset('js/darkroom.js') }}"></script>
-	<script src="{{ asset('js/jquery.caret.min.js') }}"></script>
+	<script src="{{ mix('js/fabric.js') }}"></script>
+	<script src="{{ mix('js/darkroom.js') }}"></script>
+	<script src="{{ mix('js/jquery.caret.min.js') }}"></script>
 @endsection
diff --git a/webpack.mix.js b/webpack.mix.js
index 825dccb..00be1f5 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -49,7 +49,7 @@ mix.js([
         enabled: true,
         useBuiltIns: "usage",
         targets: { "firefox": "50", "ie": 11 }
-    });
+    }).version();
 
 // * COPY JS STATIC VENDORS
 mix.copyDirectory('resources/vendor/js', "public/js");