Merge branch 'develop' into matthew/redesign
This commit is contained in:
commit
ffb9ce89c7
15 changed files with 100 additions and 23 deletions
|
@ -70,8 +70,6 @@ module.exports = React.createClass({
|
|||
var SenderProfile = sdk.getComponent('molecules.SenderProfile');
|
||||
var MemberAvatar = sdk.getComponent('atoms.MemberAvatar');
|
||||
|
||||
var UnknownMessageTile = sdk.getComponent('molecules.UnknownMessageTile');
|
||||
|
||||
var content = this.props.mxEvent.getContent();
|
||||
var msgtype = content.msgtype;
|
||||
|
||||
|
@ -79,7 +77,7 @@ module.exports = React.createClass({
|
|||
// This shouldn't happen: the caller should check we support this type
|
||||
// before trying to instantiate us
|
||||
if (!EventTileType) {
|
||||
return null;
|
||||
throw new Error("Event type not supported");
|
||||
}
|
||||
|
||||
var classes = classNames({
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue