javascripts/ajouter-un-album.js

@@ -78,12 +78,6 @@ Vue.createApp({
             ],
         };
     },
-    created() {
-        window.addEventListener("keydown", this.keyDown);
-    },
-    destroyed() {
-        window.removeEventListener("keydown", this.keyDown);
-    },
     methods: {
         search(event) {
             event.preventDefault();
@@ -195,13 +189,5 @@ Vue.createApp({
         orderedItems(items) {
             return items.sort();
         },
-        keyDown(event) {
-            const keycode = event.code;
-
-            if (this.modalIsVisible && keycode === "Escape") {
-                event.preventDefault();
-                this.modalIsVisible = false;
-            }
-        },
     },
 }).mount("#ajouter-album");

javascripts/collection.js

@@ -34,11 +34,6 @@ Vue.createApp({
     },
     created() {
         this.fetch();
-
-        window.addEventListener("keydown", this.keyDown);
-    },
-    destroyed() {
-        window.removeEventListener("keydown", this.keyDown);
     },
     methods: {
         formatParams(param) {
@@ -246,16 +241,5 @@ Vue.createApp({
 
             return render;
         },
-        keyDown(event) {
-            const keycode = event.code;
-            if (this.showModalDelete && keycode === "Escape") {
-                event.preventDefault();
-                this.showModalDelete = false;
-            }
-            if (this.showModalShare && keycode === "Escape") {
-                event.preventDefault();
-                this.showModalShare = false;
-            }
-        },
     },
 }).mount("#collection");

javascripts/mon-compte/ma-collection/details.js

@@ -25,10 +25,10 @@ if (typeof item !== "undefined") {
             this.setTrackList();
             this.setIdentifiers();
 
-            window.addEventListener("keydown", this.keyDown);
+            window.addEventListener("keydown", this.changeImage);
         },
         destroyed() {
-            window.removeEventListener("keydown", this.keyDown);
+            window.removeEventListener("keydown", this.changeImage);
         },
         watch: {
             shareMessage(message) {
@@ -139,10 +139,10 @@ if (typeof item !== "undefined") {
                 this.setImage();
             },
             changeImage(event) {
-                event.preventDefault();
                 const direction = event.code;
 
                 if (
+                    this.modalIsVisible &&
                     ["ArrowRight", "ArrowLeft", "Escape"].indexOf(direction) !==
                         -1
                 ) {
@@ -159,20 +159,6 @@ if (typeof item !== "undefined") {
 
                 return true;
             },
-            keyDown(event) {
-                const keycode = event.code;
-                if (this.modalIsVisible) {
-                    this.changeImage(event);
-                }
-                if (this.showModalDelete && keycode === "Escape") {
-                    event.preventDefault();
-                    this.showModalDelete = false;
-                }
-                if (this.showModalShare && keycode === "Escape") {
-                    event.preventDefault();
-                    this.showModalShare = false;
-                }
-            },
             showAllIdentifiers() {
                 this.identifiersMode = "all";
                 this.setIdentifiers();

views/components/album.ejs

@@ -12,7 +12,7 @@
                   </ul>
                   <ul v-if="track.extraartists && track.extraartists.length > 0" class="sm-hidden">
                       <li v-for="extra in track.extraartists" class=" ml-4">
-                            <small>{{extra.role}} : <a :href="`/ma-collection?page=1&limit=16&sort=year&order=asc&artist=${extra.name}`">{{extra.name}}</a></small>
+                          <small>{{extra.role}} : {{extra.name}}</small>
                       </li>
                   </ul>
               </li>
@@ -130,4 +130,4 @@
           </div>
       </div>
   </div>
-  </div>
+</div>