OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Prefer context.matrixClient in LeftPanel

pull/6042/head
lukebarnard 2018-02-06 11:50:34 +00:00
parent 37fe3ac676
commit e46f436a47
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,6 @@ import { MatrixClient } from 'matrix-js-sdk';
import { KeyCode } from 'matrix-react-sdk/lib/Keyboard'; import { KeyCode } from 'matrix-react-sdk/lib/Keyboard';
import sdk from 'matrix-react-sdk'; import sdk from 'matrix-react-sdk';
import dis from 'matrix-react-sdk/lib/dispatcher'; import dis from 'matrix-react-sdk/lib/dispatcher';
import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
import VectorConferenceHandler from '../../VectorConferenceHandler'; import VectorConferenceHandler from '../../VectorConferenceHandler';
import SettingsStore from "matrix-react-sdk/lib/settings/SettingsStore"; import SettingsStore from "matrix-react-sdk/lib/settings/SettingsStore";
@ -206,7 +205,7 @@ var LeftPanel = React.createClass({
dis.dispatch(RoomListActions.tagRoom( dis.dispatch(RoomListActions.tagRoom(
this.context.matrixClient, this.context.matrixClient,
MatrixClientPeg.get().getRoom(roomId), this.context.matrixClient.getRoom(roomId),
prevTag, newTag, prevTag, newTag,
oldIndex, newIndex, oldIndex, newIndex,
), true); ), true);
@ -223,7 +222,7 @@ var LeftPanel = React.createClass({
const CallPreview = sdk.getComponent('voip.CallPreview'); const CallPreview = sdk.getComponent('voip.CallPreview');
let topBox; let topBox;
if (MatrixClientPeg.get().isGuest()) { if (this.context.matrixClient.isGuest()) {
const LoginBox = sdk.getComponent('structures.LoginBox'); const LoginBox = sdk.getComponent('structures.LoginBox');
topBox = <LoginBox collapsed={ this.props.collapsed }/>; topBox = <LoginBox collapsed={ this.props.collapsed }/>;
} else { } else {