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

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

Frontend ui refactor
This commit is contained in:
daniel 2019-02-12 23:36:06 -07:00 committed by GitHub
parent c7daf74191 cbd92515cd
commit 985af8c0a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/timeline.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -8,5 +8,5 @@
"/js/micro.js": "/js/micro.js?id=69703f96f09e6ff04be6",
"/js/profile.js": "/js/profile.js?id=dd006b565cac9962d5ad",
"/js/status.js": "/js/status.js?id=281d075819ccc5ea794d",
"/js/timeline.js": "/js/timeline.js?id=6a87d35b5038f2968eb8"
"/js/timeline.js": "/js/timeline.js?id=5bd746e687f9a8a894b7"
}

4
resources/assets/js/components/Timeline.vue
View File

@ -398,7 +398,7 @@
infiniteTimeline($state) {
let homeTimeline = '/api/v1/timelines/home';
let localTimeline = '/api/v1/timelines/public';
let apiUrl = this.scope == '/' ? homeTimeline : localTimeline;
let apiUrl = this.scope == 'home' ? homeTimeline : localTimeline;
axios.get(apiUrl, {
params: {
page: this.page,
@ -424,7 +424,7 @@
loadMore() {
let homeTimeline = '/api/v1/timelines/home';
let localTimeline = '/api/v1/timelines/public';
let apiUrl = this.scope == '/' ? homeTimeline : localTimeline;
let apiUrl = this.scope == 'home' ? homeTimeline : localTimeline;
axios.get(apiUrl, {
params: {
page: this.page,