diff options
author | unarist <m.unarist@gmail.com> | 2017-05-25 12:22:46 +0900 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-25 05:22:46 +0200 |
commit | 807c192fcf3a6cd0f4c712ec43130fbffddcc6c6 (patch) | |
tree | 8956d82961a88cb8205e43d14a88fc017374a738 /app/javascript/mastodon/reducers/timelines.js | |
parent | 3b59f9c6c254e34d95d917857ccbe79f6e1104b0 (diff) |
Fix load more feature on the Account media gallery (#3293)
* Add load more button for large screens * Fix `next` state value on the first loading * Don't load if `isLoading || !hasMore` * Start load on near the bottom
Diffstat (limited to 'app/javascript/mastodon/reducers/timelines.js')
-rw-r--r-- | app/javascript/mastodon/reducers/timelines.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/mastodon/reducers/timelines.js b/app/javascript/mastodon/reducers/timelines.js index 2e95d645e..49eb4756c 100644 --- a/app/javascript/mastodon/reducers/timelines.js +++ b/app/javascript/mastodon/reducers/timelines.js @@ -155,7 +155,7 @@ const normalizeAccountTimeline = (state, accountId, statuses, replace = false) = .update('items', Immutable.List(), list => (replace ? ids : ids.concat(list)))); }; -const normalizeAccountMediaTimeline = (state, accountId, statuses, next) => { +const normalizeAccountMediaTimeline = (state, accountId, statuses) => { let ids = Immutable.List(); statuses.forEach((status, i) => { @@ -165,7 +165,7 @@ const normalizeAccountMediaTimeline = (state, accountId, statuses, next) => { return state.updateIn(['accounts_media_timelines', accountId], Immutable.Map(), map => map .set('isLoading', false) - .set('next', next) + .set('next', true) .update('items', Immutable.List(), list => ids.concat(list))); }; @@ -345,7 +345,7 @@ export default function timelines(state = initialState, action) { case ACCOUNT_MEDIA_TIMELINE_EXPAND_FAIL: return state.updateIn(['accounts_media_timelines', action.id], Immutable.Map(), map => map.set('isLoading', false)); case ACCOUNT_MEDIA_TIMELINE_FETCH_SUCCESS: - return normalizeAccountMediaTimeline(state, action.id, Immutable.fromJS(action.statuses), action.next); + return normalizeAccountMediaTimeline(state, action.id, Immutable.fromJS(action.statuses)); case ACCOUNT_MEDIA_TIMELINE_EXPAND_SUCCESS: return appendNormalizedAccountMediaTimeline(state, action.id, Immutable.fromJS(action.statuses), action.next); case ACCOUNT_BLOCK_SUCCESS: |