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

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

Frontend ui refactor
This commit is contained in:
daniel 2019-04-22 13:41:47 -06:00 committed by GitHub
parent 36929de8da d8d45385f6
commit 30302097c5
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

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/compose.js": "/js/compose.js?id=9436fc6ceea845e5bd62",
"/js/developers.js": "/js/developers.js?id=1359f11c7349301903f8", "/js/developers.js": "/js/developers.js?id=1359f11c7349301903f8",
"/js/discover.js": "/js/discover.js?id=75fb12b06ee23fa05186", "/js/discover.js": "/js/discover.js?id=75fb12b06ee23fa05186",
"/js/profile.js": "/js/profile.js?id=bf431aa6387f69c6a91d", "/js/profile.js": "/js/profile.js?id=a99eaa5b1863b61a0002",
"/js/search.js": "/js/search.js?id=0d3d080dc05f4f49b204", "/js/search.js": "/js/search.js?id=0d3d080dc05f4f49b204",
"/js/status.js": "/js/status.js?id=0b11c2129b9ebdb0eddf", "/js/status.js": "/js/status.js?id=0b11c2129b9ebdb0eddf",
"/js/timeline.js": "/js/timeline.js?id=a55e77b5ab5237de0aaf" "/js/timeline.js": "/js/timeline.js?id=a55e77b5ab5237de0aaf"

2
resources/assets/js/components/Profile.vue
View File

@ -580,7 +580,7 @@ export default {
}, },
infiniteTimeline($state) { infiniteTimeline($state) {
if(this.loading) { if(this.loading || this.timeline < 9) {
return; return;
} }
let apiUrl = '/api/v1/accounts/' + this.profileId + '/statuses'; let apiUrl = '/api/v1/accounts/' + this.profileId + '/statuses';