diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-30 10:29:19 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-30 10:29:19 +0100 |
| commit | fe111a8badbbb4059451c3f04cbaf79893af4ab0 (patch) | |
| tree | ec96a12ff97c57a781a3120f38e80a20d3d669f8 | |
| parent | 1a7aa37b60769a10077c585fa76ec848b6866d9a (diff) | |
| parent | 1122697b375da82cbb156b73eb1015ae066fc6ee (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
| -rw-r--r-- | .circleci/config.yml | 4 | ||||
| -rw-r--r-- | app/javascript/mastodon/features/status/index.js | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 2a60ae684..bddfd2d27 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: diff --git a/app/javascript/mastodon/features/status/index.js b/app/javascript/mastodon/features/status/index.js index cb67944c9..8a63cced2 100644 --- a/app/javascript/mastodon/features/status/index.js +++ b/app/javascript/mastodon/features/status/index.js @@ -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') }); } |