fix weird indentation
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
parent
ff9141e424
commit
baba2e12e2
1 changed files with 38 additions and 39 deletions
|
@ -1496,49 +1496,48 @@ module.exports = React.createClass({
|
||||||
const TimelinePanel = sdk.getComponent("structures.TimelinePanel");
|
const TimelinePanel = sdk.getComponent("structures.TimelinePanel");
|
||||||
|
|
||||||
if (!this.state.room) {
|
if (!this.state.room) {
|
||||||
if (this.state.roomLoading) {
|
if (this.state.roomLoading) {
|
||||||
return (
|
return (
|
||||||
<div className="mx_RoomView">
|
<div className="mx_RoomView">
|
||||||
<Loader />
|
<Loader />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
} 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 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.
|
// 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;
|
var room_alias = this.props.roomAddress[0] == '#' ? this.props.roomAddress : null;
|
||||||
return (
|
return (
|
||||||
<div className="mx_RoomView">
|
<div className="mx_RoomView">
|
||||||
<RoomHeader ref="header"
|
<RoomHeader ref="header"
|
||||||
room={this.state.room}
|
room={this.state.room}
|
||||||
oobData={this.props.oobData}
|
oobData={this.props.oobData}
|
||||||
collapsedRhs={ this.props.collapsedRhs }
|
collapsedRhs={ this.props.collapsedRhs }
|
||||||
|
/>
|
||||||
|
<div className="mx_RoomView_auxPanel">
|
||||||
|
<RoomPreviewBar onJoinClick={ this.onJoinButtonClicked }
|
||||||
|
onForgetClick={ this.onForgetClick }
|
||||||
|
onRejectClick={ this.onRejectThreepidInviteButtonClicked }
|
||||||
|
canPreview={ false } error={ this.state.roomLoadError }
|
||||||
|
roomAlias={room_alias}
|
||||||
|
spinner={this.state.joining}
|
||||||
|
inviterName={inviterName}
|
||||||
|
invitedEmail={invitedEmail}
|
||||||
|
room={this.state.room}
|
||||||
/>
|
/>
|
||||||
<div className="mx_RoomView_auxPanel">
|
|
||||||
<RoomPreviewBar onJoinClick={ this.onJoinButtonClicked }
|
|
||||||
onForgetClick={ this.onForgetClick }
|
|
||||||
onRejectClick={ this.onRejectThreepidInviteButtonClicked }
|
|
||||||
canPreview={ false } error={ this.state.roomLoadError }
|
|
||||||
roomAlias={room_alias}
|
|
||||||
spinner={this.state.joining}
|
|
||||||
inviterName={inviterName}
|
|
||||||
invitedEmail={invitedEmail}
|
|
||||||
room={this.state.room}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div className="mx_RoomView_messagePanel"></div>
|
|
||||||
</div>
|
</div>
|
||||||
);
|
<div className="mx_RoomView_messagePanel"></div>
|
||||||
}
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var myUserId = MatrixClientPeg.get().credentials.userId;
|
var myUserId = MatrixClientPeg.get().credentials.userId;
|
||||||
|
|
Loading…
Reference in a new issue