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

Merge pull request #5131 from vector-im/luke/groups-button

Browse source 
Add button to get to MyGroups
This commit is contained in:
Luke Barnard 2017-09-29 11:00:29 +01:00 • committed by GitHub
commit 5544270bc4
3 changed files with 143 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,9 +19,9 @@ import React from 'react';
import ReactDOM from 'react-dom';
import sdk from 'matrix-react-sdk';
import dis from 'matrix-react-sdk/lib/dispatcher';
import AccessibleButton from 'matrix-react-sdk/lib/components/views/elements/AccessibleButton';
import Velocity from 'velocity-vector';
import 'velocity-vector/velocity.ui';
import UserSettingsStore from 'matrix-react-sdk/lib/UserSettingsStore';
const CALLOUT_ANIM_DURATION = 1000;
@ -167,8 +167,12 @@ module.exports = React.createClass({
const StartChatButton = sdk.getComponent('elements.StartChatButton');
const RoomDirectoryButton = sdk.getComponent('elements.RoomDirectoryButton');
const CreateRoomButton = sdk.getComponent('elements.CreateRoomButton');
const GroupsButton = sdk.getComponent('elements.GroupsButton');
const SettingsButton = sdk.getComponent('elements.SettingsButton');
const groupsButton = UserSettingsStore.isFeatureEnabled('feature_groups') ?
<GroupsButton tooltip={true} /> : null;
return (
<div className="mx_BottomLeftMenu">
<div className="mx_BottomLeftMenu_options">
@ -182,6 +186,7 @@ module.exports = React.createClass({
<div ref={this._collectCreateRoomButton}>
<CreateRoomButton tooltip={true} />
</div>
{ groupsButton }
<span className="mx_BottomLeftMenu_settings">
<SettingsButton tooltip={true} />
</span>