gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Weblate 2017-08-11 09:49:29 +00:00
parent 7a3c52af7e 3eeabe8d91
commit 711a8cee8a
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/structures/RightPanel.js
View File

@ -31,7 +31,7 @@ module.exports = React.createClass({
displayName: 'RightPanel', displayName: 'RightPanel',
propTypes: { propTypes: {
userId: React.PropTypes.string, // if showing an orphaned MemberInfo page, this is set // TODO: This should not be a prop, it should be received from the RoomViewStore
roomId: React.PropTypes.string, // if showing panels for a given room, this is set roomId: React.PropTypes.string, // if showing panels for a given room, this is set
collapsed: React.PropTypes.bool, // currently unused property to request for a minimized view of the panel collapsed: React.PropTypes.bool, // currently unused property to request for a minimized view of the panel
}, },
@ -57,17 +57,9 @@ module.exports = React.createClass({
}, },
getInitialState: function() { getInitialState: function() {
if (this.props.userId) { return {
var member = new Matrix.RoomMember(null, this.props.userId); phase: this.Phase.MemberList
return { };
phase: this.Phase.MemberInfo,
member: member,
};
} else {
return {
phase: this.Phase.MemberList
};
}
}, },
onMemberListButtonClick: function() { onMemberListButtonClick: function() {
@ -229,7 +221,7 @@ module.exports = React.createClass({
} }
else if(this.state.phase == this.Phase.MemberInfo) { else if(this.state.phase == this.Phase.MemberInfo) {
var MemberInfo = sdk.getComponent('rooms.MemberInfo'); var MemberInfo = sdk.getComponent('rooms.MemberInfo');
panel = <MemberInfo member={this.state.member} key={this.props.roomId || this.props.userId} /> panel = <MemberInfo member={this.state.member} key={this.props.roomId || this.state.member.userId} />
} }
else if (this.state.phase == this.Phase.NotificationPanel) { else if (this.state.phase == this.Phase.NotificationPanel) {
panel = <NotificationPanel /> panel = <NotificationPanel />