Browse Source

Fix breaks when opening a reply tree in WebUI (#10046)

fix #10045
master
rinsuki 5 years ago
committed by Eugen Rochko
parent
commit
f9a338b473
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      app/javascript/mastodon/components/status.js

+ 2
- 2
app/javascript/mastodon/components/status.js View File

@ -86,7 +86,7 @@ class Status extends ImmutablePureComponent {
// Track height changes we know about to compensate scrolling // Track height changes we know about to compensate scrolling
componentDidMount () { componentDidMount () {
this.didShowCard = !this.props.muted && !this.props.hidden && this.props.status.get('card');
this.didShowCard = !this.props.muted && !this.props.hidden && this.props.status && this.props.status.get('card');
} }
getSnapshotBeforeUpdate () { getSnapshotBeforeUpdate () {
@ -99,7 +99,7 @@ class Status extends ImmutablePureComponent {
// Compensate height changes // Compensate height changes
componentDidUpdate (prevProps, prevState, snapshot) { componentDidUpdate (prevProps, prevState, snapshot) {
const doShowCard = !this.props.muted && !this.props.hidden && this.props.status.get('card');
const doShowCard = !this.props.muted && !this.props.hidden && this.props.status && this.props.status.get('card');
if (doShowCard && !this.didShowCard) { if (doShowCard && !this.didShowCard) {
this.didShowCard = true; this.didShowCard = true;
if (snapshot !== null && this.props.updateScrollBottom) { if (snapshot !== null && this.props.updateScrollBottom) {

Loading…
Cancel
Save