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

Merge remote-tracking branch 'upstream/develop' into feature/hidden-rrs

Browse Source
This commit is contained in:
Šimon Brandner
2021-07-16 10:21:30 +02:00
parent 18343d839c 6809817c77
commit 651f19fb9b
130 changed files with 2032 additions and 1027 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/TimelinePanel.tsx
View File

@@ -1055,6 +1055,8 @@ class TimelinePanel extends React.Component<IProps, IState> {
{ windowLimit: this.props.timelineCap });
const onLoaded = () => {
if (this.unmounted) return;
// clear the timeline min-height when
// (re)loading the timeline
if (this.messagePanel.current) {
@@ -1096,6 +1098,8 @@ class TimelinePanel extends React.Component<IProps, IState> {
};
const onError = (error) => {
if (this.unmounted) return;
this.setState({ timelineLoading: false });
console.error(
`Error loading timeline panel at ${eventId}: ${error}`,