matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-18 09:22:18 +03:00
Code Activity

Thread teamToken through to LeftPanel for "Home" button

Browse Source 
This means the riot-web will use the same teamToken used by sdk components. This includes cases where only the fragment query parameter has been provided.

Fixes matrix-org/riot-web#3185
This commit is contained in:
Luke Barnard
2017-02-10 09:57:28 +00:00
parent 7ba9e27893
commit 45f5b8b3a9
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -232,7 +232,12 @@ export default React.createClass({
<div className='mx_MatrixChat_wrapper'>
{topBar}
<div className={bodyClasses}>
<LeftPanel selectedRoom={this.props.currentRoomId} collapsed={this.props.collapse_lhs || false} opacity={this.props.sideOpacity}/>
<LeftPanel
selectedRoom={this.props.currentRoomId}
collapsed={this.props.collapse_lhs || false}
opacity={this.props.sideOpacity}
teamToken={this.props.teamToken}
/>
<main className='mx_MatrixChat_middlePanel'>
{page_element}
</main>