imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
commit 651f19fb9b
No known key found for this signature in database
GPG key ID: 9760693FDD98A790
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}`,