PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

get MatrixClient from context

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2018-04-27 11:30:47 +01:00
parent 88f48914b4
commit 3ba9f560d4
No known key found for this signature in database
GPG key ID: 3F879DA5AD802A5E
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/components/views/elements/ReplyThread.js
View file

@ -18,9 +18,8 @@ import sdk from '../../../index';
import {_t} from '../../../languageHandler'; import {_t} from '../../../languageHandler';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import dis from '../../../dispatcher'; import dis from '../../../dispatcher';
import MatrixClientPeg from '../../../MatrixClientPeg';
import {wantsDateSeparator} from '../../../DateUtils'; import {wantsDateSeparator} from '../../../DateUtils';
import {MatrixEvent} from 'matrix-js-sdk'; import {MatrixEvent, MatrixClient} from 'matrix-js-sdk';
import {makeEventPermalink, makeUserPermalink} from "../../../matrix-to"; import {makeEventPermalink, makeUserPermalink} from "../../../matrix-to";
import SettingsStore from "../../../settings/SettingsStore"; import SettingsStore from "../../../settings/SettingsStore";
@ -35,6 +34,10 @@ export default class ReplyThread extends React.Component {
onWidgetLoad: PropTypes.func.isRequired, onWidgetLoad: PropTypes.func.isRequired,
}; };
static contextTypes = {
matrixClient: PropTypes.instanceOf(MatrixClient).isRequired,
};
constructor(props, context) { constructor(props, context) {
super(props, context); super(props, context);
@ -58,7 +61,7 @@ export default class ReplyThread extends React.Component {
componentWillMount() { componentWillMount() {
this.unmounted = false; this.unmounted = false;
this.room = MatrixClientPeg.get().getRoom(this.props.parentEv.getRoomId()); this.room = this.context.matrixClient.getRoom(this.props.parentEv.getRoomId());
this.initialize(); this.initialize();
} }
@ -121,7 +124,7 @@ export default class ReplyThread extends React.Component {
if (event) return event; if (event) return event;
try { try {
await MatrixClientPeg.get().getEventTimeline(room.getUnfilteredTimelineSet(), eventId); await this.context.matrixClient.getEventTimeline(room.getUnfilteredTimelineSet(), eventId);
} catch (e) { } catch (e) {
return null; return null;
} }
@ -257,7 +260,7 @@ export default class ReplyThread extends React.Component {
} else if (this.state.loadedEv) { } else if (this.state.loadedEv) {
const ev = this.state.loadedEv; const ev = this.state.loadedEv;
const Pill = sdk.getComponent('elements.Pill'); const Pill = sdk.getComponent('elements.Pill');
const room = MatrixClientPeg.get().getRoom(ev.getRoomId()); const room = this.context.matrixClient.getRoom(ev.getRoomId());
header = <blockquote className="mx_ReplyThread"> header = <blockquote className="mx_ReplyThread">
{ {
_t('<a>In reply to</a> <pill>', {}, { _t('<a>In reply to</a> <pill>', {}, {