aboutsummaryrefslogtreecommitdiff
path: root/src/components/media_upload/media_upload.js
diff options
context:
space:
mode:
authorHJ <spam@hjkos.com>2018-12-13 21:02:17 +0000
committerHJ <spam@hjkos.com>2018-12-13 21:02:17 +0000
commit99b2b7a20358a1324ea139353109784213ebd5d3 (patch)
tree9b57ad2f701b1f5df4dc3061a1ad5e155dccec62 /src/components/media_upload/media_upload.js
parentdcca4617d5647e0570b359c4e1b14737c552bc7b (diff)
parentdd6a9ae6458784b36ffe2376492284ae4e79fece (diff)
Merge branch 'feature/file-size-checking' into 'develop'
[pleroma#36] Add errors when file uploading fails See merge request pleroma/pleroma-fe!405
Diffstat (limited to 'src/components/media_upload/media_upload.js')
-rw-r--r--src/components/media_upload/media_upload.js9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js
index 66337c3f..42d900d3 100644
--- a/src/components/media_upload/media_upload.js
+++ b/src/components/media_upload/media_upload.js
@@ -1,5 +1,6 @@
/* eslint-env browser */
import statusPosterService from '../../services/status_poster/status_poster.service.js'
+import fileSizeFormatService from '../../services/file_size_format/file_size_format.js'
const mediaUpload = {
mounted () {
@@ -21,6 +22,12 @@ const mediaUpload = {
uploadFile (file) {
const self = this
const store = this.$store
+ if (file.size > store.state.instance.uploadlimit) {
+ const filesize = fileSizeFormatService.fileSizeFormat(file.size)
+ const allowedsize = fileSizeFormatService.fileSizeFormat(store.state.instance.uploadlimit)
+ self.$emit('upload-failed', 'file_too_big', {filesize: filesize.num, filesizeunit: filesize.unit, allowedsize: allowedsize.num, allowedsizeunit: allowedsize.unit})
+ return
+ }
const formData = new FormData()
formData.append('media', file)
@@ -32,7 +39,7 @@ const mediaUpload = {
self.$emit('uploaded', fileData)
self.uploading = false
}, (error) => { // eslint-disable-line handle-callback-err
- self.$emit('upload-failed')
+ self.$emit('upload-failed', 'default')
self.uploading = false
})
},