Merge pull request #880 from matrix-org/t3chguy/fixRoomHeaderPreviewing

various fixes to RoomHeader
This commit is contained in:
Matthew Hodgson 2017-05-15 01:52:42 +01:00 committed by GitHub
commit 7f78e737eb
3 changed files with 16 additions and 7 deletions

View file

@ -1772,6 +1772,7 @@ module.exports = React.createClass({
oobData={this.props.oobData}
editing={this.state.editingRoomSettings}
saving={this.state.uploadingRoomSettings}
inRoom={myMember && myMember.membership === 'join'}
collapsedRhs={ this.props.collapsedRhs }
onSearchClick={this.onSearchClick}
onSettingsClick={this.onSettingsClick}