matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00
Code Activity

Fix cancel button on uploads

Browse Source
This commit is contained in:
David Baker
2016-12-16 17:11:28 +00:00
parent b8c0fa507e
commit 4be14080e1
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ContentMessages.js
View File

@@ -256,10 +256,14 @@ function uploadFile(matrixClient, roomId, file) {
});
});
} else {
return matrixClient.uploadContent(file).then(function(url) {
const basePromise = matrixClient.uploadContent(file);
const promise1 = basePromise.then(function(url) {
// If the attachment isn't encrypted then include the URL directly.
return {"url": url};
});
// XXX: copy over the abort method to the new promise
promise1.abort = basePromise.abort;
return promise1;
}
}
@@ -322,13 +326,16 @@ class ContentMessages {
var error;
return def.promise.then(function() {
// XXX: upload.promise must be the promise that
// is returned by uploadFile as it has an abort()
// method hacked onto it.
upload.promise = uploadFile(
matrixClient, roomId, file
).then(function(result) {
);
return upload.promise.then(function(result) {
content.file = result.file;
content.url = result.url;
});
return upload.promise;
}).progress(function(ev) {
if (ev) {
upload.total = ev.total;