OrgGo
/
filebrowser
mirror of https://github.com/filebrowser/filebrowser.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: conflict handling on upload button

This commit is contained in:
Ramires Viana 2020-07-21 17:41:52 +00:00
parent f2d2c1cbf8
commit f228fa5540
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/components/files/Listing.vue
View File

@ -418,12 +418,13 @@ export default {
confirm: (event) => { confirm: (event) => {
event.preventDefault() event.preventDefault()
this.$store.commit('closeHovers') this.$store.commit('closeHovers')
this.handleFiles(files, path, true) upload.handleFiles(files, path, true)
} }
}) })
return return
} }
upload.handleFiles(files, path) upload.handleFiles(files, path)
}, },
resetOpacity () { resetOpacity () {

2
frontend/src/components/prompts/Upload.vue
View File

@ -27,9 +27,11 @@ export default {
name: 'upload', name: 'upload',
methods: { methods: {
uploadFile: function () { uploadFile: function () {
document.getElementById('upload-input').value = ''
document.getElementById('upload-input').click() document.getElementById('upload-input').click()
}, },
uploadFolder: function () { uploadFolder: function () {
document.getElementById('upload-folder-input').value = ''
document.getElementById('upload-folder-input').click() document.getElementById('upload-folder-input').click()
} }
} }