me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix follower/following lists resetting on back-navigation in web UI (#11986)

Browse source 
Fix #11452
This commit is contained in:
Eugen Rochko 2019-09-29 16:27:00 +02:00 committed by GitHub
parent ae03161ad9
commit aadf3981fa
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/features/favourites/index.js
View file

@ -27,7 +27,9 @@ class Favourites extends ImmutablePureComponent {
}; };
componentWillMount () { componentWillMount () {
this.props.dispatch(fetchFavourites(this.props.params.statusId)); if (!this.props.accountIds) {
this.props.dispatch(fetchFavourites(this.props.params.statusId));
}
} }
componentWillReceiveProps (nextProps) { componentWillReceiveProps (nextProps) {

6
app/javascript/mastodon/features/followers/index.js
View file

@ -40,8 +40,10 @@ class Followers extends ImmutablePureComponent {
}; };
componentWillMount () { componentWillMount () {
this.props.dispatch(fetchAccount(this.props.params.accountId)); if (!this.props.accountIds) {
this.props.dispatch(fetchFollowers(this.props.params.accountId)); this.props.dispatch(fetchAccount(this.props.params.accountId));
this.props.dispatch(fetchFollowers(this.props.params.accountId));
}
} }
componentWillReceiveProps (nextProps) { componentWillReceiveProps (nextProps) {

6
app/javascript/mastodon/features/following/index.js
View file

@ -40,8 +40,10 @@ class Following extends ImmutablePureComponent {
}; };
componentWillMount () { componentWillMount () {
this.props.dispatch(fetchAccount(this.props.params.accountId)); if (!this.props.accountIds) {
this.props.dispatch(fetchFollowing(this.props.params.accountId)); this.props.dispatch(fetchAccount(this.props.params.accountId));
this.props.dispatch(fetchFollowing(this.props.params.accountId));
}
} }
componentWillReceiveProps (nextProps) { componentWillReceiveProps (nextProps) {

4
app/javascript/mastodon/features/reblogs/index.js
View file

@ -27,7 +27,9 @@ class Reblogs extends ImmutablePureComponent {
}; };
componentWillMount () { componentWillMount () {
this.props.dispatch(fetchReblogs(this.props.params.statusId)); if (!this.props.accountIds) {
this.props.dispatch(fetchReblogs(this.props.params.statusId));
}
} }
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {