]> cat aescling's git repositories - mastodon.git/commitdiff
[Glitch] Fix uninformative error message when uploading unsupported image files
authorThibG <thib@sitedethib.com>
Sat, 25 Apr 2020 10:27:29 +0000 (12:27 +0200)
committerThibaut Girka <thib@sitedethib.com>
Sat, 25 Apr 2020 13:29:01 +0000 (15:29 +0200)
Port be637146f310d7ec3a49d01e850959514e9e4964 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
app/javascript/flavours/glitch/util/resize_image.js

index 61f924f70c3670886b4166dae5ef7da00632823f..8c89b2841a108ace6e5958fca9fa017db546e1e8 100644 (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));
 });