From 279f4c84f8da26c52122a067e47c03e107af3800 Mon Sep 17 00:00:00 2001
From: chief <1092786+chief8192@users.noreply.github.com>
Date: Tue, 17 Nov 2020 20:15:10 -0500
Subject: [PATCH] Code review changes

---
 frontend/src/components/files/Preview.vue  | 11 ++++++-----
 frontend/src/components/prompts/Delete.vue |  6 ++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/files/Preview.vue b/frontend/src/components/files/Preview.vue
index e5b99877..9ed65950 100644
--- a/frontend/src/components/files/Preview.vue
+++ b/frontend/src/components/files/Preview.vue
@@ -133,14 +133,14 @@ export default {
     }
   },
   async mounted () {
-    window.addEventListener('keyup', this.key)
+    window.addEventListener('keydown', this.key)
     this.$store.commit('setPreviewMode', true)
     this.listing = this.oldReq.items
-    this.$root.$on('preview_deleted', this.deleted)
+    this.$root.$on('preview-deleted', this.deleted)
     this.updatePreview()
   },
   beforeDestroy () {
-    window.removeEventListener('keyup', this.key)
+    window.removeEventListener('keydown', this.key)
     this.$store.commit('setPreviewMode', false)
   },
   methods: {
@@ -153,8 +153,10 @@ export default {
 
       if (this.hasNext) {
         this.next()
-      } else {
+      } else if (!this.hasPrevious && !this.hasNext == true) {
         this.back()
+      } else {
+        this.prev()
       }
     },
     back () {
@@ -169,7 +171,6 @@ export default {
       this.$router.push({ path: this.nextLink })
     },
     key (event) {
-      event.preventDefault()
 
       if (this.show !== null) {
         return
diff --git a/frontend/src/components/prompts/Delete.vue b/frontend/src/components/prompts/Delete.vue
index 18fc18a1..5250acf9 100644
--- a/frontend/src/components/prompts/Delete.vue
+++ b/frontend/src/components/prompts/Delete.vue
@@ -31,7 +31,6 @@ export default {
   methods: {
     ...mapMutations(['closeHovers']),
     submit: async function () {
-      this.closeHovers()
       buttons.loading('delete')
 
       try {
@@ -39,10 +38,13 @@ export default {
           await api.remove(this.$route.path)
           buttons.success('delete')
 
-          this.$root.$emit('preview_deleted', this.$route.path)
+          this.$root.$emit('preview-deleted', this.$route.path)
+          this.closeHovers()
           return
         }
 
+        this.closeHovers()
+
         if (this.selectedCount === 0) {
           return
         }