Fix timelines loading bug
This commit is contained in:
parent
5e89b02bc6
commit
d0a9cbbd10
3 changed files with 3 additions and 3 deletions
|
@ -67,7 +67,7 @@ export function refreshTimeline(timeline, id = null) {
|
||||||
let params = '';
|
let params = '';
|
||||||
let path = timeline;
|
let path = timeline;
|
||||||
|
|
||||||
if (newestId !== null) {
|
if (newestId !== null && getState().getIn(['timelines', timeline, 'loaded'])) {
|
||||||
params = `?since_id=${newestId}`;
|
params = `?since_id=${newestId}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@ const ActionBar = React.createClass({
|
||||||
propTypes: {
|
propTypes: {
|
||||||
account: ImmutablePropTypes.map.isRequired,
|
account: ImmutablePropTypes.map.isRequired,
|
||||||
me: React.PropTypes.number.isRequired,
|
me: React.PropTypes.number.isRequired,
|
||||||
onFollow: React.PropTypes.func.isRequired,
|
onFollow: React.PropTypes.func,
|
||||||
onBlock: React.PropTypes.func.isRequired,
|
onBlock: React.PropTypes.func.isRequired,
|
||||||
onMention: React.PropTypes.func.isRequired
|
onMention: React.PropTypes.func.isRequired
|
||||||
},
|
},
|
||||||
|
|
|
@ -83,7 +83,7 @@ const normalizeTimeline = (state, timeline, statuses, replace = false) => {
|
||||||
|
|
||||||
state = state.setIn([timeline, 'loaded'], true);
|
state = state.setIn([timeline, 'loaded'], true);
|
||||||
|
|
||||||
return state.updateIn([timeline, 'items'], Immutable.List(), list => (loaded ? list.unshift(...ids) : list.push(...ids)));
|
return state.updateIn([timeline, 'items'], Immutable.List(), list => (loaded ? list.unshift(...ids) : ids));
|
||||||
};
|
};
|
||||||
|
|
||||||
const appendNormalizedTimeline = (state, timeline, statuses) => {
|
const appendNormalizedTimeline = (state, timeline, statuses) => {
|
||||||
|
|
Loading…
Reference in a new issue