ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix timelines loading bug

rebase/4.0.0rc2
Eugen Rochko 2016-12-12 14:39:18 +01:00
parent 6d1066fe61
commit 908fcf83c6
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/components/actions/timelines.jsx
View File

@ -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}`;
} }

2
app/assets/javascripts/components/features/account/components/action_bar.jsx
View File

@ -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
}, },

2
app/assets/javascripts/components/reducers/timelines.jsx
View File

@ -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) => {