gaja-group
/
element-web
forked from matrix/element-web
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-11-28 14:09:45 +00:00
parent d02ae30023 63bedc440b
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

6
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);
}, },