chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

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
parent 30302097c5 f57e883c44
commit b700306633
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/profile.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -8,7 +8,7 @@
"/js/compose.js": "/js/compose.js?id=9436fc6ceea845e5bd62",
"/js/developers.js": "/js/developers.js?id=1359f11c7349301903f8",
"/js/discover.js": "/js/discover.js?id=75fb12b06ee23fa05186",
"/js/profile.js": "/js/profile.js?id=a99eaa5b1863b61a0002",
"/js/profile.js": "/js/profile.js?id=402ccf915090841ff183",
"/js/search.js": "/js/search.js?id=0d3d080dc05f4f49b204",
"/js/status.js": "/js/status.js?id=0b11c2129b9ebdb0eddf",
"/js/timeline.js": "/js/timeline.js?id=a55e77b5ab5237de0aaf"

6
resources/assets/js/components/Profile.vue
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();
}