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

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

BIN
public/js/profile.js vendored

Binary file not shown.

Binary file not shown.

View file

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