Browse Source

Fix uninformative error message when uploading unsupported image files (#13540)

Attempting to upload image files that the browser is unable to load results
in “Oops! An unexpected error occurred.”

This commit changes the error handling so that an unprocessable image results
in the file being sent anyway, which might cover a few corner cases, and
provide a slightly better error message.
master^2
ThibG GitHub 1 year ago
parent
commit
be637146f3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      app/javascript/mastodon/utils/resize_image.js

+ 2
- 2
app/javascript/mastodon/utils/resize_image.js View File

@@ -138,7 +138,7 @@ const resizeImage = (img, type = 'image/png') => new Promise((resolve, reject) =
.catch(reject);
});

export default inputFile => new Promise((resolve, reject) => {
export default inputFile => new Promise((resolve) => {
if (!inputFile.type.match(/image.*/) || inputFile.type === 'image/gif') {
resolve(inputFile);
return;
@@ -153,5 +153,5 @@ export default inputFile => new Promise((resolve, reject) => {
resizeImage(img, inputFile.type)
.then(resolve)
.catch(() => resolve(inputFile));
}).catch(reject);
}).catch(() => resolve(inputFile));
});

Loading…
Cancel
Save