1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-11 13:19:01 +09:00

Merge branch 'main' into glitch-soc/merge-upstream

This commit is contained in:
Claire 2022-11-30 10:29:19 +01:00
commit fe111a8bad
2 changed files with 7 additions and 1 deletions

View File

@ -68,7 +68,9 @@ jobs:
cache-version: v1
pkg-manager: yarn
- run:
command: ./bin/rails assets:precompile
command: |
export NODE_OPTIONS=--openssl-legacy-provider
./bin/rails assets:precompile
name: Precompile assets
- persist_to_workspace:
paths:

View File

@ -222,6 +222,10 @@ class Status extends ImmutablePureComponent {
this.props.dispatch(fetchStatus(nextProps.params.statusId));
}
if (nextProps.params.statusId && nextProps.ancestorsIds.size > this.props.ancestorsIds.size) {
this._scrolledIntoView = false;
}
if (nextProps.status && nextProps.status.get('id') !== this.state.loadedStatusId) {
this.setState({ showMedia: defaultMediaVisibility(nextProps.status), loadedStatusId: nextProps.status.get('id') });
}