From 12d971bf3c451c38c6dde732355f92dd943448d5 Mon Sep 17 00:00:00 2001 From: chief <1092786+chief8192@users.noreply.github.com> Date: Sun, 22 Nov 2020 08:18:30 -0500 Subject: [PATCH] More review changes for #1091 --- frontend/src/components/files/Preview.vue | 11 ++++------- frontend/src/components/prompts/Delete.vue | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/frontend/src/components/files/Preview.vue b/frontend/src/components/files/Preview.vue index 9ed65950..f72ad38b 100644 --- a/frontend/src/components/files/Preview.vue +++ b/frontend/src/components/files/Preview.vue @@ -142,18 +142,15 @@ export default { beforeDestroy () { window.removeEventListener('keydown', this.key) this.$store.commit('setPreviewMode', false) + this.$root.$off('preview-deleted', this.deleted) }, methods: { - deleted (path) { - - let pieces = path.split('/') - let deletedName = decodeURIComponent(pieces[pieces.length - 1]) - - this.listing = this.listing.filter(item => item.name !== deletedName) + deleted () { + this.listing = this.listing.filter(item => item.name !== this.name) if (this.hasNext) { this.next() - } else if (!this.hasPrevious && !this.hasNext == true) { + } else if (!this.hasPrevious && !this.hasNext) { this.back() } else { this.prev() diff --git a/frontend/src/components/prompts/Delete.vue b/frontend/src/components/prompts/Delete.vue index 5250acf9..67cbb33e 100644 --- a/frontend/src/components/prompts/Delete.vue +++ b/frontend/src/components/prompts/Delete.vue @@ -38,7 +38,7 @@ 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.closeHovers() return }