matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code Activity

Fix rooms we don't have any info about

Browse Source
This commit is contained in:
David Baker
2016-03-02 10:59:54 +00:00
parent 9085a2a866
commit 10b1b6443d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/rooms/RoomHeader.js
View File

@@ -229,10 +229,10 @@ module.exports = React.createClass({
} }
} }
var roomName; var roomName = 'Join Room';
if (this.props.oobData && this.props.oobData.name) { if (this.props.oobData && this.props.oobData.name) {
roomName = this.props.oobData.name; roomName = this.props.oobData.name;
} else { } else if (this.props.room) {
this.props.room.name; this.props.room.name;
} }
@@ -278,7 +278,7 @@ module.exports = React.createClass({
</div> </div>
); );
} }
else { else if (this.props.room || (this.props.oobData && this.props.oobData.name)) {
roomAvatar = ( roomAvatar = (
<div onClick={this.props.onSettingsClick}> <div onClick={this.props.onSettingsClick}>
<RoomAvatar room={this.props.room} width={48} height={48} oobData={this.props.oobData} /> <RoomAvatar room={this.props.room} width={48} height={48} oobData={this.props.oobData} />