merge aviral's audio player

This commit is contained in:
Matthew Hodgson 2016-04-13 00:00:24 +01:00
parent 6a6739e0f3
commit bfec6d4ed9
4 changed files with 59 additions and 1 deletions

View file

@ -74,10 +74,13 @@ class ContentMessages {
var def = q.defer();
if (file.type.indexOf('image/') == 0) {
content.msgtype = 'm.image';
infoForImageFile(file).then(function(imageInfo) {
infoForImageFile(file).then(function (imageInfo) {
extend(content.info, imageInfo);
def.resolve();
});
} else if (file.type.indexOf('audio/') == 0) {
content.msgtype = 'm.audio';
def.resolve();
} else {
content.msgtype = 'm.file';
def.resolve();