fix: conflict handling on upload button

filebrowser · Jul 23, 2020 · f228fa5 · f228fa5
1 parent f2d2c1c
commit f228fa5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/frontend/src/components/files/Listing.vue b/frontend/src/components/files/Listing.vue
@@ -418,12 +418,13 @@ export default {
           confirm: (event) => {
             event.preventDefault()
             this.$store.commit('closeHovers')
-            this.handleFiles(files, path, true)
+            upload.handleFiles(files, path, true)
           }
         })
 
         return
       }
+
       upload.handleFiles(files, path)
     },
     resetOpacity () {

diff --git a/frontend/src/components/prompts/Upload.vue b/frontend/src/components/prompts/Upload.vue
@@ -27,9 +27,11 @@ export default {
   name: 'upload',
   methods: {
     uploadFile: function () {
+      document.getElementById('upload-input').value = ''
       document.getElementById('upload-input').click()
     },
     uploadFolder: function () {
+      document.getElementById('upload-folder-input').value = ''
       document.getElementById('upload-folder-input').click()
     }
   }