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

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

View File

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