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

Update Timeline.vue component, fix integer overflow bug in pagination

This commit is contained in:
Daniel Supernault 2019-10-07 00:47:25 -06:00
parent 139c6651bf
commit fbef8977fd
No known key found for this signature in database
GPG Key ID: 0DEF1C662C9033F7
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -564,10 +564,7 @@
if(this.profile.is_admin == true) {
this.modes.mod = true;
}
$('.profile-card .loader').addClass('d-none');
$('.profile-card .contents').removeClass('d-none');
$('.profile-card .card-footer').removeClass('d-none');
this.expRec();
//this.expRec();
}).catch(err => {
swal(
'Oops, something went wrong',
@ -602,8 +599,8 @@
this.feed.push(...data);
let ids = data.map(status => status.id);
this.ids = ids;
this.min_id = Math.max(...ids);
this.max_id = Math.min(...ids);
this.min_id = Math.max(...ids).toString();
this.max_id = Math.min(...ids).toString();
this.loading = false;
$('.timeline .pagination').removeClass('d-none');
// if(this.feed.length == 4) {
@ -626,6 +623,10 @@
$state.complete();
return;
}
if(this.page > 40) {
this.loading = false;
$state.complete();
}
let apiUrl = false;
switch(this.scope) {
case 'home':
@ -655,8 +656,8 @@
self.ids.push(d.id);
}
});
this.min_id = Math.max(...this.ids);
this.max_id = Math.min(...this.ids);
this.min_id = Math.max(...this.ids).toString();
this.max_id = Math.min(...this.ids).toString();
this.page += 1;
$state.loaded();
this.loading = false;