From fbef8977fd794da0fd42ac8c01372ea445f6a9c5 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 7 Oct 2019 00:47:25 -0600 Subject: [PATCH] Update Timeline.vue component, fix integer overflow bug in pagination --- resources/assets/js/components/Timeline.vue | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue index fdf8c1233..6de709a04 100644 --- a/resources/assets/js/components/Timeline.vue +++ b/resources/assets/js/components/Timeline.vue @@ -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;