tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Ondřej Hruška
2017-10-11 21:27:17 +02:00
parent 3cc6255a7e 6bc07d3de3
commit 0bf9261e65
12 changed files with 64 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/javascript/mastodon/features/status/index.js
View File

@@ -80,6 +80,7 @@ export default class Status extends ImmutablePureComponent {
componentWillReceiveProps (nextProps) {
if (nextProps.params.statusId !== this.props.params.statusId && nextProps.params.statusId) {
this._scrolledIntoView = false;
this.props.dispatch(fetchStatus(nextProps.params.statusId));
}
}
@@ -242,11 +243,17 @@ export default class Status extends ImmutablePureComponent {
}
componentDidUpdate () {
if (this._scrolledIntoView) {
return;
}
const { status, ancestorsIds } = this.props;
if (status && ancestorsIds && ancestorsIds.size > 0) {
const element = this.node.querySelectorAll('.focusable')[ancestorsIds.size];
element.scrollIntoView();
const element = this.node.querySelectorAll('.focusable')[ancestorsIds.size - 1];
element.scrollIntoView(true);
this._scrolledIntoView = true;
}
}