OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/21833/head
David Baker 2015-12-03 10:52:06 +00:00
parent e8f5131ed6
commit 4c2fe55fdc
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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});
if (!upload.canceled) {
var desc = "The file '"+upload.fileName+"' failed to upload.";
if (err.http_status == 413) {
desc = "The file '"+upload.fileName+"' exceeds this home server's size limit for uploads";
}
var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog"); var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, { Modal.createDialog(ErrorDialog, {
title: "Upload Failed", title: "Upload Failed",
description: "The file '"+upload.fileName+"' failed to upload." 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) {