UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-10 00:34:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-04-22 13:53:46 -06:00 committed by GitHub
commit b700306633
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
public/js/profile.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

6
resources/assets/js/components/Profile.vue
View file

@ -559,11 +559,11 @@ export default {
}) })
.then(res => { .then(res => {
let data = res.data; let data = res.data;
this.timeline = data;
let ids = data.map(status => status.id); let ids = data.map(status => status.id);
this.min_id = Math.max(...ids); this.min_id = Math.max(...ids);
this.max_id = Math.min(...ids); this.max_id = Math.min(...ids);
this.modalStatus = _.first(res.data); this.modalStatus = _.first(res.data);
this.timeline = data;
this.ownerCheck(); this.ownerCheck();
this.loading = false; this.loading = false;
}).catch(err => { }).catch(err => {
@ -592,11 +592,11 @@ export default {
}).then(res => { }).then(res => {
if (res.data.length && this.loading == false) { if (res.data.length && this.loading == false) {
let data = res.data; let data = res.data;
this.timeline.push(...data);
let ids = data.map(status => status.id); let ids = data.map(status => status.id);
this.max_id = Math.min(...ids); this.max_id = Math.min(...ids);
this.loading = false; this.timeline.push(...data);
$state.loaded(); $state.loaded();
this.loading = false;
} else { } else {
$state.complete(); $state.complete();
} }