diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-04-24 17:59:11 +0200 |
---|---|---|
committer | ThibG <thib@sitedethib.com> | 2019-04-24 20:19:23 +0200 |
commit | ef1504d6259c6d656885b4d5c036d498b471530d (patch) | |
tree | c406da8761caf951556efd385bbe19e943188bd2 /app/javascript/flavours/glitch/actions | |
parent | ffab9d626a41ecb05f8f61f7615005753a0ee060 (diff) |
Fix upload progressbar when image resizing is involved
Diffstat (limited to 'app/javascript/flavours/glitch/actions')
-rw-r--r-- | app/javascript/flavours/glitch/actions/compose.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/actions/compose.js b/app/javascript/flavours/glitch/actions/compose.js index ac09adceb..ef2500629 100644 --- a/app/javascript/flavours/glitch/actions/compose.js +++ b/app/javascript/flavours/glitch/actions/compose.js @@ -227,8 +227,8 @@ export function uploadCompose(files) { return function (dispatch, getState) { const uploadLimit = 4; const media = getState().getIn(['compose', 'media_attachments']); - const total = Array.from(files).reduce((a, v) => a + v.size, 0); const progress = new Array(files.length).fill(0); + let total = Array.from(files).reduce((a, v) => a + v.size, 0); if (files.length + media.size > uploadLimit) { dispatch(showAlert(undefined, messages.uploadErrorLimit)); @@ -248,6 +248,8 @@ export function uploadCompose(files) { resizeImage(f).then(file => { const data = new FormData(); data.append('file', file); + // Account for disparity in size of original image and resized data + total += file.size - f.size; return api(getState).post('/api/v1/media', data, { onUploadProgress: function({ loaded }){ |