mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-12 08:13:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Weblate 2017-11-28 14:09:45 +00:00
commit 59f1cc3922
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -127,7 +127,7 @@ module.exports = React.createClass({
return { return {
phase: this.props.groupId ? this.Phase.GroupMemberList : this.Phase.RoomMemberList, phase: this.props.groupId ? this.Phase.GroupMemberList : this.Phase.RoomMemberList,
isUserPrivilegedInGroup: null, isUserPrivilegedInGroup: null,
} };
}, },
componentWillReceiveProps(newProps) { componentWillReceiveProps(newProps) {
@ -139,9 +139,7 @@ module.exports = React.createClass({
_initGroupStore(groupId) { _initGroupStore(groupId) {
if (!groupId) return; if (!groupId) return;
this._groupStore = GroupStoreCache.getGroupStore( this._groupStore = GroupStoreCache.getGroupStore(groupId);
this.context.matrixClient, groupId,
);
this._groupStore.registerListener(this.onGroupStoreUpdated); this._groupStore.registerListener(this.onGroupStoreUpdated);
}, },
@ -151,7 +149,7 @@ module.exports = React.createClass({
} }
}, },
onGroupStoreUpdated: function(){ onGroupStoreUpdated: function() {
this.setState({ this.setState({
isUserPrivilegedInGroup: this._groupStore.isUserPrivileged(), isUserPrivilegedInGroup: this._groupStore.isUserPrivileged(),
}); });