Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3196 from vector-im/luke/rts-thread-team-token

Browse Source 
Use the teamToken threaded through from react sdk
This commit is contained in:
David Baker 2017-02-10 10:43:24 +00:00 committed by GitHub
commit b6741d9b10
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/structures/BottomLeftMenu.js
View File

@ -27,6 +27,7 @@ module.exports = React.createClass({
propTypes: {
collapsed: React.PropTypes.bool.isRequired,
teamToken: React.PropTypes.string,
},
getInitialState: function() {
@ -36,13 +37,6 @@ module.exports = React.createClass({
homeHover: false,
peopleHover : false,
settingsHover : false,
teamToken: null,
});
},
componentWillMount: function() {
this.setState({
teamToken: window.localStorage.getItem('mx_team_token'),
});
},
@ -122,7 +116,7 @@ module.exports = React.createClass({
var TintableSvg = sdk.getComponent('elements.TintableSvg');
var homeButton;
if (this.state.teamToken) {
if (this.props.teamToken) {
homeButton = (
<AccessibleButton className="mx_BottomLeftMenu_homePage" onClick={ this.onHomeClick } onMouseEnter={ this.onHomeMouseEnter } onMouseLeave={ this.onHomeMouseLeave } >
<TintableSvg src="img/icons-home.svg" width="25" height="25" />

7
src/components/structures/LeftPanel.js
View File

@ -28,6 +28,11 @@ var CallHandler = require("matrix-react-sdk/lib/CallHandler");
var LeftPanel = React.createClass({
displayName: 'LeftPanel',
propTypes: {
collapsed: React.PropTypes.bool.isRequired,
teamToken: React.PropTypes.string,
},
getInitialState: function() {
return {
showCallElement: null,
@ -124,7 +129,7 @@ var LeftPanel = React.createClass({
collapsed={this.props.collapsed}
searchFilter={this.state.searchFilter}
ConferenceHandler={VectorConferenceHandler} />
<BottomLeftMenu collapsed={this.props.collapsed}/>
<BottomLeftMenu collapsed={this.props.collapsed} teamToken={this.props.teamToken}/>
</aside>
);
}