imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into dbkr/show_invited_email

Browse source
This commit is contained in:
David Baker 2016-03-18 15:34:15 +00:00
commit 3e915cf0e2
15 changed files with 121 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,6 +36,7 @@ module.exports = React.createClass({
canJoin: React.PropTypes.bool,
canPreview: React.PropTypes.bool,
spinner: React.PropTypes.bool,
room: React.PropTypes.object,
},
getDefaultProps: function() {
@ -110,10 +111,13 @@ module.exports = React.createClass({
}
else if (this.props.canJoin) {
var name = this.props.room ? this.props.room.name : "";
name = name ? <b>{ name }</b> : "a room";
joinBlock = (
<div>
<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>
);