diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js index 2d5cfff8e0..817fe42e94 100644 --- a/src/components/structures/RoomView.js +++ b/src/components/structures/RoomView.js @@ -1496,49 +1496,48 @@ module.exports = React.createClass({ const TimelinePanel = sdk.getComponent("structures.TimelinePanel"); if (!this.state.room) { - if (this.state.roomLoading) { - return ( -
- -
- ); + if (this.state.roomLoading) { + return ( +
+ +
+ ); + } else { + var inviterName = undefined; + if (this.props.oobData) { + inviterName = this.props.oobData.inviterName; + } + var invitedEmail = undefined; + if (this.props.thirdPartyInvite) { + invitedEmail = this.props.thirdPartyInvite.invitedEmail; } - else { - var inviterName = undefined; - if (this.props.oobData) { - inviterName = this.props.oobData.inviterName; - } - var invitedEmail = undefined; - if (this.props.thirdPartyInvite) { - invitedEmail = this.props.thirdPartyInvite.invitedEmail; - } - // We have no room object for this room, only the ID. - // We've got to this room by following a link, possibly a third party invite. - var room_alias = this.props.roomAddress[0] == '#' ? this.props.roomAddress : null; - return ( -
- + +
+ -
- -
-
- ); - } +
+
+ ); + } } var myUserId = MatrixClientPeg.get().credentials.userId;