diff options
author | David Yip <yipdw@member.fsf.org> | 2018-01-09 17:01:23 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-09 17:01:23 -0600 |
commit | 622c8fdb75f20f1aee73b5db6d2dc90416bb3b08 (patch) | |
tree | 940b08c3ccbc5901877d0afdb086f42055e5703e /app/javascript/flavours/glitch/actions/favourites.js | |
parent | 991371af5f22ba85199f3f66bab5f70b404de95f (diff) | |
parent | aef4b1af666f3fe66778bff0bab83b780fc71732 (diff) |
Merge pull request #314 from chriswmartin/merge-vanilla-updates-2
Merge vanilla updates into glitch - round 2
Diffstat (limited to 'app/javascript/flavours/glitch/actions/favourites.js')
-rw-r--r-- | app/javascript/flavours/glitch/actions/favourites.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/actions/favourites.js b/app/javascript/flavours/glitch/actions/favourites.js index decdcee4f..0c0f3af44 100644 --- a/app/javascript/flavours/glitch/actions/favourites.js +++ b/app/javascript/flavours/glitch/actions/favourites.js @@ -10,6 +10,10 @@ export const FAVOURITED_STATUSES_EXPAND_FAIL = 'FAVOURITED_STATUSES_EXPAND_FA export function fetchFavouritedStatuses() { return (dispatch, getState) => { + if (getState().getIn(['status_lists', 'favourites', 'isLoading'])) { + return; + } + dispatch(fetchFavouritedStatusesRequest()); api(getState).get('/api/v1/favourites').then(response => { @@ -46,7 +50,7 @@ export function expandFavouritedStatuses() { return (dispatch, getState) => { const url = getState().getIn(['status_lists', 'favourites', 'next'], null); - if (url === null) { + if (url === null || getState().getIn(['status_lists', 'favourites', 'isLoading'])) { return; } |