PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Show the invite preview bar when we have a 3pid invite, and make the reject button work.

Browse source
This commit is contained in:
David Baker 2016-03-10 15:56:58 +00:00
parent 7660276b54
commit 2875fa3eb1
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -883,6 +883,12 @@ module.exports = React.createClass({
}); });
}, },
onRejectThreepidInviteButtonClicked: function(ev) {
dis.dispatch({
action: 'view_room_directory',
});
},
onSearchClick: function() { onSearchClick: function() {
this.setState({ searching: true }); this.setState({ searching: true });
}, },
@ -1086,6 +1092,7 @@ module.exports = React.createClass({
<RoomHeader ref="header" room={this.state.room} oobData={this.props.oobData} /> <RoomHeader ref="header" room={this.state.room} oobData={this.props.oobData} />
<div className="mx_RoomView_auxPanel"> <div className="mx_RoomView_auxPanel">
<RoomPreviewBar onJoinClick={ this.onJoinButtonClicked } <RoomPreviewBar onJoinClick={ this.onJoinButtonClicked }
onRejectClick={ this.onRejectThreepidInviteButtonClicked }
canJoin={ true } canPreview={ false } canJoin={ true } canPreview={ false }
spinner={this.state.joining} spinner={this.state.joining}
inviterName={inviterName} inviterName={inviterName}
@ -1192,9 +1199,15 @@ module.exports = React.createClass({
} }
else if (this.state.guestsCanJoin && MatrixClientPeg.get().isGuest() && else if (this.state.guestsCanJoin && MatrixClientPeg.get().isGuest() &&
(!myMember || myMember.membership !== "join")) { (!myMember || myMember.membership !== "join")) {
var inviterName = undefined;
if (this.props.oobData) {
inviterName = this.props.oobData.inviterName;
}
aux = ( aux = (
<RoomPreviewBar onJoinClick={this.onJoinButtonClicked} canJoin={true} <RoomPreviewBar onJoinClick={this.onJoinButtonClicked} canJoin={true}
onRejectClick={ this.onRejectThreepidInviteButtonClicked }
spinner={this.state.joining} spinner={this.state.joining}
inviterName={inviterName}
/> />
); );
} }