diff --git a/resources/assets/components/Hashtag.vue b/resources/assets/components/Hashtag.vue index e2ac77681..01094a85b 100644 --- a/resources/assets/components/Hashtag.vue +++ b/resources/assets/components/Hashtag.vue @@ -202,16 +202,12 @@ if(res.data && res.data.length) { this.feed = res.data; this.maxId = res.data[res.data.length - 1].id; - return true; + this.canLoadMore = true; } else { this.feedLoaded = true; this.isLoaded = true; - return false; } }) - .then(res => { - this.canLoadMore = res; - }) .finally(() => { this.feedLoaded = true; this.isLoaded = true; @@ -242,14 +238,11 @@ if(res.data && res.data.length) { this.feed.push(...res.data); this.maxId = res.data[res.data.length - 1].id; - return true; + this.canLoadMore = true; } else { - return false; + this.canLoadMore = false; } }) - .then(res => { - this.canLoadMore = res; - }) .finally(() => { this.isIntersecting = false; })