mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 03:36:07 +03:00
Code Issues Projects Releases Packages Wiki Activity

improve RoomPreviewBar as per https://github.com/vector-im/vector-web/issues/761

Browse source
This commit is contained in:
Matthew Hodgson 2016-03-17 19:19:05 +00:00
parent cb4bbc04e0
commit e55a375d6f
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/structures/RoomView.js
View file

@ -1107,6 +1107,7 @@ module.exports = React.createClass({
canJoin={ true } canPreview={ false } canJoin={ true } canPreview={ false }
spinner={this.state.joining} spinner={this.state.joining}
inviterName={inviterName} inviterName={inviterName}
room={this.state.room}
/> />
</div> </div>
<div className="mx_RoomView_messagePanel"></div> <div className="mx_RoomView_messagePanel"></div>
@ -1147,6 +1148,7 @@ module.exports = React.createClass({
inviterName={ inviterName } inviterName={ inviterName }
canJoin={ true } canPreview={ false } canJoin={ true } canPreview={ false }
spinner={this.state.joining} spinner={this.state.joining}
room={this.state.room}
/> />
</div> </div>
<div className="mx_RoomView_messagePanel"></div> <div className="mx_RoomView_messagePanel"></div>
@ -1219,6 +1221,7 @@ module.exports = React.createClass({
onRejectClick={ this.onRejectThreepidInviteButtonClicked } onRejectClick={ this.onRejectThreepidInviteButtonClicked }
spinner={this.state.joining} spinner={this.state.joining}
inviterName={inviterName} inviterName={inviterName}
room={this.state.room}
/> />
); );
} }
@ -1226,6 +1229,7 @@ module.exports = React.createClass({
aux = ( aux = (
<RoomPreviewBar onJoinClick={this.onJoinButtonClicked} canJoin={true} <RoomPreviewBar onJoinClick={this.onJoinButtonClicked} canJoin={true}
spinner={this.state.joining} canPreview={ this.state.canPeek } spinner={this.state.joining} canPreview={ this.state.canPeek }
room={this.state.room}
/> />
); );
} }

6
src/components/views/rooms/RoomPreviewBar.js
View file

@ -32,6 +32,7 @@ module.exports = React.createClass({
canJoin: React.PropTypes.bool, canJoin: React.PropTypes.bool,
canPreview: React.PropTypes.bool, canPreview: React.PropTypes.bool,
spinner: React.PropTypes.bool, spinner: React.PropTypes.bool,
room: React.PropTypes.object,
}, },
getDefaultProps: function() { getDefaultProps: function() {
@ -66,10 +67,13 @@ module.exports = React.createClass({
} }
else if (this.props.canJoin) { else if (this.props.canJoin) {
var name = this.props.room ? this.props.room.name : "";
name = name ? <b>{ name }</b> : "a room";
joinBlock = ( joinBlock = (
<div> <div>
<div className="mx_RoomPreviewBar_join_text"> <div className="mx_RoomPreviewBar_join_text">
Would you like to <a onClick={ this.props.onJoinClick }>join</a> this room? You are trying to access { name }.<br/>
Would you like to <a onClick={ this.props.onJoinClick }>join</a> in order to participate in the discussion?
</div> </div>
</div> </div>
); );