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

Un-commit accidentally committed file upload stuff

pull/21833/head
David Baker 2015-12-01 10:25:35 +00:00
parent 1df03aa82a
commit 1de5d68e95
1 changed files with 28 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/ContentMessages.js
View File

@ -18,7 +18,6 @@ limitations under the License.
var q = require('q'); var q = require('q');
var extend = require('./extend'); var extend = require('./extend');
var dis = require('./dispatcher');
function infoForImageFile(imageFile) { function infoForImageFile(imageFile) {
var deferred = q.defer(); var deferred = q.defer();
@ -49,13 +48,7 @@ function infoForImageFile(imageFile) {
return deferred.promise; return deferred.promise;
} }
class ContentMessages { function sendContentToRoom(file, roomId, matrixClient) {
constructor() {
this.inprogress = [];
this.nextId = 0;
}
sendContentToRoom(file, roomId, matrixClient) {
var content = { var content = {
body: file.name, body: file.name,
info: { info: {
@ -80,63 +73,14 @@ class ContentMessages {
def.resolve(); def.resolve();
} }
var upload = {
fileName: file.name,
roomId: roomId,
total: 0,
loaded: 0
};
this.inprogress.push(upload);
dis.dispatch({action: 'upload_started'});
var self = this;
return def.promise.then(function() { return def.promise.then(function() {
upload.promise = matrixClient.uploadContent(file); return matrixClient.uploadContent(file);
return upload.promise;
}).then(function(url) { }).then(function(url) {
content.url = url; content.url = url;
return matrixClient.sendMessage(roomId, content); return matrixClient.sendMessage(roomId, content);
}).progress(function(ev) {
if (ev) {
upload.total = ev.total;
upload.loaded = ev.loaded;
dis.dispatch({action: 'upload_progress', upload: upload});
}
}).then(function() {
dis.dispatch({action: 'upload_finished', upload: upload});
}, function(err) {
dis.dispatch({action: 'upload_failed', upload: upload});
}).finally(function() {
var inprogressKeys = Object.keys(self.inprogress);
for (var i = 0; i < self.inprogress.length; ++i) {
var k = inprogressKeys[i];
if (self.inprogress[k].promise === upload_promise) {
delete self.inprogress[k];
break;
}
}
}); });
}
getCurrentUploads() {
return this.inprogress;
}
cancelUpload(promise) {
var inprogressKeys = Object.keys(self.inprogress);
for (var i = 0; i < self.inprogress.length; ++i) {
var k = inprogressKeys[i];
if (self.inprogress[k].promise === promise) {
self.inprogress[k].canceled = true;
break;
}
}
MatrixClientPeg.get().cancelUpload(promise);
}
} }
if (global.mx_ContentMessage === undefined) { module.exports = {
global.mx_ContentMessage = new ContentMessages(); sendContentToRoom: sendContentToRoom
} };
module.exports = global.mx_ContentMessage;