post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Merge commit 'b878e3d8df' into kb_migration_development

Browse source
This commit is contained in:
KMY 2023-05-10 17:58:14 +09:00
commit f3867c10de
30 changed files with 51 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/features/status/components/card.jsx
View file

@ -66,7 +66,7 @@ export default class Card extends React.PureComponent {
revealed: !this.props.sensitive,
};
componentWillReceiveProps (nextProps) {
UNSAFE_componentWillReceiveProps (nextProps) {
if (!Immutable.is(this.props.card, nextProps.card)) {
this.setState({ embedded: false, previewLoaded: false });
}

4
app/javascript/mastodon/features/status/index.jsx
View file

@ -209,7 +209,7 @@ class Status extends ImmutablePureComponent {
loadedStatusId: undefined,
};
componentWillMount () {
UNSAFE_componentWillMount () {
this.props.dispatch(fetchStatus(this.props.params.statusId));
}
@ -217,7 +217,7 @@ class Status extends ImmutablePureComponent {
attachFullscreenListener(this.onFullScreenChange);
}
componentWillReceiveProps (nextProps) {
UNSAFE_componentWillReceiveProps (nextProps) {
if (nextProps.params.statusId !== this.props.params.statusId && nextProps.params.statusId) {
this._scrolledIntoView = false;
this.props.dispatch(fetchStatus(nextProps.params.statusId));