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
commit b15218cc22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 3 deletions

BIN
public/js/timeline.js vendored

Binary file not shown.

Binary file not shown.

View file

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