OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2601 from matrix-org/bwindels/fixstartdm 

Fix: typeerror when creating DM
pull/21833/head
Bruno Windels 2019-02-08 17:39:29 +00:00 committed by GitHub
parent 0ca6ea20d9 8fdb94911c
commit 7f630b2b46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,10 +209,15 @@ module.exports = React.createClass({
const topicElement = const topicElement =
<div className="mx_RoomHeader_topic" ref="topic" title={topic} dir="auto">{ topic }</div>; <div className="mx_RoomHeader_topic" ref="topic" title={topic} dir="auto">{ topic }</div>;
const avatarSize = 28; const avatarSize = 28;
const roomAvatar = ( let roomAvatar;
<RoomAvatar room={this.props.room} width={avatarSize} height={avatarSize} oobData={this.props.oobData} if (this.props.room) {
viewAvatarOnClick={true} /> roomAvatar = (<RoomAvatar
); room={this.props.room}
width={avatarSize}
height={avatarSize}
oobData={this.props.oobData}
viewAvatarOnClick={true} />);
}
if (this.props.onSettingsClick) { if (this.props.onSettingsClick) {
settingsButton = settingsButton =