ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Glitch] Fix uninformative error message when uploading unsupported image files 

Port be637146f3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
rebase/4.0.0rc2
ThibG 2020-04-25 12:27:29 +02:00 committed by Thibaut Girka
parent 572e89e563
commit 9d41a410a3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/flavours/glitch/util/resize_image.js
View File

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