UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-20 03:53:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #745 from pixelfed/frontend-ui-refactor

Browse source 
Fix timeline bug
This commit is contained in:
daniel 2019-01-05 22:03:48 -07:00 committed by GitHub
commit 8aca53412c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/js/components.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

13
resources/assets/js/components/Timeline.vue
View file

@ -219,7 +219,7 @@
export default { export default {
data() { data() {
return { return {
page: 1, page: 2,
feed: [], feed: [],
profile: {}, profile: {},
scope: window.location.pathname, scope: window.location.pathname,
@ -228,6 +228,7 @@
notifications: {}, notifications: {},
stories: {}, stories: {},
suggestions: {}, suggestions: {},
loading: true,
} }
}, },
@ -260,8 +261,8 @@
}, },
fetchTimelineApi() { fetchTimelineApi() {
let homeTimeline = '/api/v1/timelines/home?page=' + this.page; let homeTimeline = '/api/v1/timelines/home?page=1';
let localTimeline = '/api/v1/timelines/public?page=' + this.page; let localTimeline = '/api/v1/timelines/public?page=1';
let apiUrl = this.scope == '/' ? homeTimeline : localTimeline; let apiUrl = this.scope == '/' ? homeTimeline : localTimeline;
axios.get(apiUrl).then(res => { axios.get(apiUrl).then(res => {
$('.timeline .loader').addClass('d-none'); $('.timeline .loader').addClass('d-none');
@ -272,7 +273,7 @@
if(this.page == 1) { if(this.page == 1) {
this.max_id = Math.max(...ids); this.max_id = Math.max(...ids);
} }
this.page++; this.loading = false;
}).catch(err => { }).catch(err => {
}); });
}, },
@ -286,8 +287,7 @@
page: this.page, page: this.page,
}, },
}).then(res => { }).then(res => {
if (res.data.length) { if (res.data.length && this.loading == false) {
$('.timeline .loader').addClass('d-none');
let data = res.data; let data = res.data;
this.feed.push(...data); this.feed.push(...data);
let ids = data.map(status => status.id); let ids = data.map(status => status.id);
@ -297,6 +297,7 @@
} }
this.page += 1; this.page += 1;
$state.loaded(); $state.loaded();
this.loading = false;
} else { } else {
$state.complete(); $state.complete();
} }