matrix/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2025-11-29 21:23:11 +03:00
Code Activity

Fix some stuff

Browse Source
This commit is contained in:
Michael Telatynski
2020-08-29 12:51:37 +01:00
parent 34b960d8cb
commit 78812b6f85
9 changed files with 51 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/components/structures/TimelinePanel.js
View File

@@ -134,13 +134,6 @@ class TimelinePanel extends React.Component {
this._messagePanel = createRef();
if (this.props.manageReadReceipts) {
this.updateReadReceiptOnUserActivity();
}
if (this.props.manageReadMarkers) {
this.updateReadMarkerOnUserActivity();
}
// XXX: we could track RM per TimelineSet rather than per Room.
// but for now we just do it per room for simplicity.
let initialReadMarker = null;
@@ -225,6 +218,16 @@ class TimelinePanel extends React.Component {
MatrixClientPeg.get().on("Event.decrypted", this.onEventDecrypted);
MatrixClientPeg.get().on("Event.replaced", this.onEventReplaced);
MatrixClientPeg.get().on("sync", this.onSync);
}
// TODO: [REACT-WARNING] Move into constructor
UNSAFE_componentWillMount() {
if (this.props.manageReadReceipts) {
this.updateReadReceiptOnUserActivity();
}
if (this.props.manageReadMarkers) {
this.updateReadMarkerOnUserActivity();
}
this._initTimeline(this.props);
}
@@ -1360,9 +1363,7 @@ class TimelinePanel extends React.Component {
});
}
getRelationsForEvent(...args) {
return this.props.timelineSet.getRelationsForEvent(...args);
}
getRelationsForEvent = (...args) => this.props.timelineSet.getRelationsForEvent(...args);
render() {
const MessagePanel = sdk.getComponent("structures.MessagePanel");