aboutsummaryrefslogtreecommitdiff
path: root/src/components/media_upload/media_upload.js
diff options
context:
space:
mode:
authorSean King <seanking2919@protonmail.com>2022-08-06 22:02:21 -0600
committerSean King <seanking2919@protonmail.com>2022-08-06 22:02:21 -0600
commitdc9951d400fc6f4e9080d29589bf186fb081f4f6 (patch)
tree06491c209236128adaf47644babd2ade44c490e3 /src/components/media_upload/media_upload.js
parent18d69f93d38dc15a74db81ee4c10b4766bebfc35 (diff)
parent610720f164dc9fcf36f9df33bddec5ac9c654e1e (diff)
Fix merge conflicts
Diffstat (limited to 'src/components/media_upload/media_upload.js')
-rw-r--r--src/components/media_upload/media_upload.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js
index 669d8190..cfd42d4c 100644
--- a/src/components/media_upload/media_upload.js
+++ b/src/components/media_upload/media_upload.js
@@ -42,7 +42,8 @@ const mediaUpload = {
.then((fileData) => {
self.$emit('uploaded', fileData)
self.decreaseUploadCount()
- }, (error) => { // eslint-disable-line handle-callback-err
+ }, (error) => {
+ console.error('Error uploading file', error)
self.$emit('upload-failed', 'default')
self.decreaseUploadCount()
})
@@ -73,7 +74,7 @@ const mediaUpload = {
'disabled'
],
watch: {
- 'dropFiles': function (fileInfos) {
+ dropFiles: function (fileInfos) {
if (!this.uploading) {
this.multiUpload(fileInfos)
}