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

merge aviral's audio player

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/messages/MessageEvent.js
View file

@ -55,6 +55,7 @@ module.exports = React.createClass({
'm.emote': sdk.getComponent('messages.TextualBody'),
'm.image': sdk.getComponent('messages.MImageBody'),
'm.file': sdk.getComponent('messages.MFileBody'),
'm.audio': sdk.getComponent('messages.MAudioBody'),
'm.video': sdk.getComponent('messages.MVideoBody')
};
@ -63,6 +64,9 @@ module.exports = React.createClass({
var BodyType = UnknownBody;
if (msgtype && bodyTypes[msgtype]) {
BodyType = bodyTypes[msgtype];
} else if (content.url) {
// Fallback to MFileBody if there's a content URL
BodyType = bodyTypes['m.file'];
}
return <BodyType ref="body" mxEvent={this.props.mxEvent} highlights={this.props.highlights}