mirror of
https://github.com/SchildiChat/element-web.git
synced 2024-10-01 01:26:12 -04:00
Remove userId property on RightPanel
because we shouldn't have a dispatch AND have a property that do vaguely similar things. Ideally, the dispatch would send a userId and RP would do async work to get the member/avatar/displayname.
This commit is contained in:
parent
ee2fb17945
commit
7269e7b84a
@ -31,7 +31,6 @@ module.exports = React.createClass({
|
|||||||
displayName: 'RightPanel',
|
displayName: 'RightPanel',
|
||||||
|
|
||||||
propTypes: {
|
propTypes: {
|
||||||
userId: React.PropTypes.string, // if showing an orphaned MemberInfo page, this is set
|
|
||||||
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 +56,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 +220,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 />
|
||||||
|
Loading…
Reference in New Issue
Block a user