mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge branch 'develop' into travis/granular

Browse source
This commit is contained in:
Travis Ralston 2017-11-13 12:25:56 -07:00
commit 7570ce580f
72 changed files with 1565 additions and 235 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/structures/BottomLeftMenu.js
View file

@ -170,9 +170,6 @@ module.exports = React.createClass({
const GroupsButton = sdk.getComponent('elements.GroupsButton');
const SettingsButton = sdk.getComponent('elements.SettingsButton');
const groupsButton = SettingsStore.isFeatureEnabled('feature_groups') ?
<GroupsButton tooltip={true} /> : null;
return (
<div className="mx_BottomLeftMenu">
<div className="mx_BottomLeftMenu_options">
@ -186,12 +183,12 @@ module.exports = React.createClass({
<div ref={this._collectCreateRoomButton}>
<CreateRoomButton tooltip={true} />
</div>
{ groupsButton }
<GroupsButton tooltip={true} />
<span className="mx_BottomLeftMenu_settings">
<SettingsButton tooltip={true} />
</span>
</div>
</div>
);
}
},
});

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

@ -127,8 +127,9 @@ module.exports = React.createClass({
},
_initGroupStore(groupId) {
if (!groupId) return;
this._groupStore = GroupStoreCache.getGroupStore(
this.context.matrixClient, this.props.groupId,
this.context.matrixClient, groupId,
);
this._groupStore.registerListener(this.onGroupStoreUpdated);
},