Browse Source

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

Fix #11452
master
Eugen Rochko 5 years ago
committed by GitHub
parent
commit
9683e1dcf8
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 6 deletions
  1. +3
    -1
      app/javascript/mastodon/features/favourites/index.js
  2. +4
    -2
      app/javascript/mastodon/features/followers/index.js
  3. +4
    -2
      app/javascript/mastodon/features/following/index.js
  4. +3
    -1
      app/javascript/mastodon/features/reblogs/index.js

+ 3
- 1
app/javascript/mastodon/features/favourites/index.js View File

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

+ 4
- 2
app/javascript/mastodon/features/followers/index.js View File

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

+ 4
- 2
app/javascript/mastodon/features/following/index.js View File

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

+ 3
- 1
app/javascript/mastodon/features/reblogs/index.js View File

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

Loading…
Cancel
Save