Fix timelines loading bug

master
Eugen Rochko 8 years ago
parent 6d1066fe61
commit 908fcf83c6
  1. 2
      app/assets/javascripts/components/actions/timelines.jsx
  2. 2
      app/assets/javascripts/components/features/account/components/action_bar.jsx
  3. 2
      app/assets/javascripts/components/reducers/timelines.jsx

@ -67,7 +67,7 @@ export function refreshTimeline(timeline, id = null) {
let params = '';
let path = timeline;
if (newestId !== null) {
if (newestId !== null && getState().getIn(['timelines', timeline, 'loaded'])) {
params = `?since_id=${newestId}`;
}

@ -39,7 +39,7 @@ const ActionBar = React.createClass({
propTypes: {
account: ImmutablePropTypes.map.isRequired,
me: React.PropTypes.number.isRequired,
onFollow: React.PropTypes.func.isRequired,
onFollow: React.PropTypes.func,
onBlock: 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);
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) => {

Loading…
Cancel
Save