mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

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

Frontend ui refactor
This commit is contained in:
daniel 2019-05-12 22:50:20 -06:00 committed by GitHub
parent dbfbed5cea b6e51cb950
commit b15218cc22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 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

@ -11,5 +11,5 @@
"/js/profile.js": "/js/profile.js?id=374b0a3f3fec1282aa55", "/js/profile.js": "/js/profile.js?id=374b0a3f3fec1282aa55",
"/js/search.js": "/js/search.js?id=0d3d080dc05f4f49b204", "/js/search.js": "/js/search.js?id=0d3d080dc05f4f49b204",
"/js/status.js": "/js/status.js?id=2c1a0fafcf34f573f537", "/js/status.js": "/js/status.js?id=2c1a0fafcf34f573f537",
"/js/timeline.js": "/js/timeline.js?id=3827e28049de5e28988b" "/js/timeline.js": "/js/timeline.js?id=2ae0450ee62c22f3839f"
} }

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

@ -471,10 +471,10 @@
axios.get('/api/v2/config') axios.get('/api/v2/config')
.then(res => { .then(res => {
this.config = res.data; this.config = res.data;
this.fetchTimelineApi();
if(window.outerWidth > 767) { if(window.outerWidth > 767) {
this.fetchProfile(); this.fetchProfile();
} }
this.fetchTimelineApi();
}); });
}, },
@ -489,7 +489,6 @@
this.showSuggestions = true; this.showSuggestions = true;
} }
if(localStorage.getItem('pf_metro_ui.exp.rm') == 'false') { if(localStorage.getItem('pf_metro_ui.exp.rm') == 'false') {
this.showReadMore = false; this.showReadMore = false;
} else { } else {
@ -523,6 +522,7 @@
$('.profile-card .loader').addClass('d-none'); $('.profile-card .loader').addClass('d-none');
$('.profile-card .contents').removeClass('d-none'); $('.profile-card .contents').removeClass('d-none');
$('.profile-card .card-footer').removeClass('d-none'); $('.profile-card .card-footer').removeClass('d-none');
this.expRec();
}).catch(err => { }).catch(err => {
swal( swal(
'Oops, something went wrong', 'Oops, something went wrong',
@ -561,7 +561,6 @@
this.max_id = Math.min(...ids); this.max_id = Math.min(...ids);
$('.timeline .pagination').removeClass('d-none'); $('.timeline .pagination').removeClass('d-none');
this.loading = false; this.loading = false;
this.expRec();
}).catch(err => { }).catch(err => {
}); });
}, },