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

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

Browse source
This commit is contained in:
Weblate 2018-03-12 17:54:09 +00:00
commit 456f9833fa
1 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/components/structures/RightPanel.js
View file

@ -167,19 +167,25 @@ module.exports = React.createClass({
return; return;
} }
if (this.state.phase === this.Phase.GroupMemberList) { // call AddressPickerDialog
showGroupInviteDialog(this.props.groupId); dis.dispatch({
} else if (this.state.phase === this.Phase.GroupRoomList) { action: 'view_invite',
showGroupAddRoomDialog(this.props.groupId).then(() => { roomId: this.props.roomId,
this.forceUpdate(); });
},
onInviteToGroupButtonClick: function() {
showGroupInviteDialog(this.props.groupId).then(() => {
this.setState({
phase: this.Phase.GroupMemberList,
}); });
} else { });
// call AddressPickerDialog },
dis.dispatch({
action: 'view_invite', onAddRoomToGroupButtonClick: function() {
roomId: this.props.roomId, showGroupAddRoomDialog(this.props.groupId).then(() => {
}); this.forceUpdate();
} });
}, },
onRoomStateMember: function(ev, state, member) { onRoomStateMember: function(ev, state, member) {
@ -233,6 +239,10 @@ module.exports = React.createClass({
this.setState({ this.setState({
phase: this.Phase.GroupRoomList, phase: this.Phase.GroupRoomList,
}); });
} else if (payload.action === "view_group_member_list") {
this.setState({
phase: this.Phase.GroupMemberList,
});
} else if (payload.action === "view_group_user") { } else if (payload.action === "view_group_user") {
this.setState({ this.setState({
phase: this.Phase.GroupMemberInfo, phase: this.Phase.GroupMemberInfo,
@ -376,14 +386,14 @@ module.exports = React.createClass({
if (this.props.groupId && this.state.isUserPrivilegedInGroup) { if (this.props.groupId && this.state.isUserPrivilegedInGroup) {
inviteGroup = isPhaseGroup ? ( inviteGroup = isPhaseGroup ? (
<AccessibleButton className="mx_RightPanel_invite" onClick={this.onInviteButtonClick}> <AccessibleButton className="mx_RightPanel_invite" onClick={this.onInviteToGroupButtonClick}>
<div className="mx_RightPanel_icon" > <div className="mx_RightPanel_icon" >
<TintableSvg src="img/icon-invite-people.svg" width="35" height="35" /> <TintableSvg src="img/icon-invite-people.svg" width="35" height="35" />
</div> </div>
<div className="mx_RightPanel_message">{ _t('Invite to this community') }</div> <div className="mx_RightPanel_message">{ _t('Invite to this community') }</div>
</AccessibleButton> </AccessibleButton>
) : ( ) : (
<AccessibleButton className="mx_RightPanel_invite" onClick={this.onInviteButtonClick}> <AccessibleButton className="mx_RightPanel_invite" onClick={this.onAddRoomToGroupButtonClick}>
<div className="mx_RightPanel_icon" > <div className="mx_RightPanel_icon" >
<TintableSvg src="img/icons-room-add.svg" width="35" height="35" /> <TintableSvg src="img/icons-room-add.svg" width="35" height="35" />
</div> </div>