Skip to content

Commit

Permalink
Fix upload progressbar when image resizing is involved (mastodon#10632)
Browse files Browse the repository at this point in the history
  • Loading branch information
ClearlyClaire authored and rosylilly committed May 4, 2019
1 parent 57ffa06 commit e126bdf
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion app/javascript/mastodon/actions/compose.js
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,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));
Expand All @@ -224,6 +224,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 }){
Expand Down

0 comments on commit e126bdf

Please sign in to comment.