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

fix https://github.com/vector-im/vector-web/issues/1040 and https://github.com/vector-im/vector-web/issues/833

pull/21833/head
Matthew Hodgson 2016-03-15 22:42:22 +00:00
parent 2bedece9a1
commit bae23c78de
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/structures/RoomView.js
View File

@ -1217,11 +1217,10 @@ module.exports = React.createClass({
/>
);
}
else if (this.state.canPeek &&
(!myMember || myMember.membership !== "join")) {
else if (!myMember || myMember.membership !== "join") {
aux = (
<RoomPreviewBar onJoinClick={this.onJoinButtonClicked} canJoin={true}
spinner={this.state.joining}
spinner={this.state.joining} canPreview={ this.state.canPeek }
/>
);
}