imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't show the error dialog if the request was canceled. Handle 'request entity too large'.

Browse source
This commit is contained in:
David Baker 2015-12-03 10:52:06 +00:00
parent e8f5131ed6
commit 4c2fe55fdc
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/ContentMessages.js
View file

@ -108,11 +108,17 @@ class ContentMessages {
return matrixClient.sendMessage(roomId, content); return matrixClient.sendMessage(roomId, content);
}, function(err) { }, function(err) {
dis.dispatch({action: 'upload_failed', upload: upload}); dis.dispatch({action: 'upload_failed', upload: upload});
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); if (!upload.canceled) {
Modal.createDialog(ErrorDialog, { var desc = "The file '"+upload.fileName+"' failed to upload.";
title: "Upload Failed", if (err.http_status == 413) {
description: "The file '"+upload.fileName+"' failed to upload." desc = "The file '"+upload.fileName+"' exceeds this home server's size limit for uploads";
}); }
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, {
title: "Upload Failed",
description: desc
});
}
}).finally(function() { }).finally(function() {
var inprogressKeys = Object.keys(self.inprogress); var inprogressKeys = Object.keys(self.inprogress);
for (var i = 0; i < self.inprogress.length; ++i) { for (var i = 0; i < self.inprogress.length; ++i) {