From af4bd5bde3fcfe9f3a9639affbe921da5002cf29 Mon Sep 17 00:00:00 2001
From: niubility000 <76441520+niubility000@users.noreply.github.com>
Date: Fri, 22 Oct 2021 00:19:45 +0800
Subject: [PATCH] Add files via upload

---
 frontend/src/components/prompts/Copy.vue          | 9 ++++++++-
 frontend/src/components/prompts/ReplaceRename.vue | 6 ------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/prompts/Copy.vue b/frontend/src/components/prompts/Copy.vue
index 1c99108c..a441846e 100644
--- a/frontend/src/components/prompts/Copy.vue
+++ b/frontend/src/components/prompts/Copy.vue
@@ -83,12 +83,18 @@ export default {
           });
       };
 
+      if (this.$route.path === this.dest) {
+        this.$store.commit("closeHovers");
+        action(false, true);
+        return;
+      }
+
       let dstItems = (await api.fetch(this.dest)).items;
       let conflict = upload.checkConflict(items, dstItems);
 
       let overwrite = false;
       let rename = false;
-      window.sessionStorage.setItem('destDir', this.dest);
+
       if (conflict) {
         this.$store.commit("showHover", {
           prompt: "replace-rename",
@@ -106,6 +112,7 @@ export default {
       }
 
       action(overwrite, rename);
+      
       if (!conflict) { 
         this.$store.commit("closeHovers");
         return;
diff --git a/frontend/src/components/prompts/ReplaceRename.vue b/frontend/src/components/prompts/ReplaceRename.vue
index 4b97dfe0..e6331388 100644
--- a/frontend/src/components/prompts/ReplaceRename.vue
+++ b/frontend/src/components/prompts/ReplaceRename.vue
@@ -28,7 +28,6 @@
       <button
         class="button button--flat button--red"
         @click="(event) => showConfirm(event, 'overwrite')"
-        :disabled="$route.path === dest"
         :aria-label="$t('buttons.replace')"
         :title="$t('buttons.replace')"
       >
@@ -43,11 +42,6 @@ import { mapState } from "vuex";
 
 export default {
   name: "replace-rename",
-  data() {
-    return {
-      dest: window.sessionStorage.getItem('destDir'),
-    };
-  },
   computed: mapState(["showConfirm"]),
 };
 </script>