From 50e7d61f6e9022d3f5d6db07b618c38699d9f968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Thu, 28 Feb 2019 18:31:35 +0100 Subject: [PATCH 1/4] =?UTF-8?q?Don't=20show=20=E2=80=9Cload=20more?= =?UTF-8?q?=E2=80=9D=20if=20there=20is=20nothing=20more=20(followers)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/js/components/Profile.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/assets/js/components/Profile.vue b/resources/assets/js/components/Profile.vue index bdeaa6bb7..f23371d67 100644 --- a/resources/assets/js/components/Profile.vue +++ b/resources/assets/js/components/Profile.vue @@ -702,7 +702,8 @@ export default { if(res.data.length > 0) { this.following.push(...res.data); this.followingCursor++; - } else { + } + if(res.data.length < 10) { this.followingMore = false; } }); @@ -719,11 +720,12 @@ export default { if(res.data.length > 0) { this.followers.push(...res.data); this.followerCursor++; - } else { + } + if(res.data.length < 10) { this.followerMore = false; } }); } } } - \ No newline at end of file + From 76aab4b435d9b8728231053108123b6b603af728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Thu, 28 Feb 2019 18:34:52 +0100 Subject: [PATCH 2/4] Update Timeline.vue --- resources/assets/js/components/Timeline.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue index baf0f6528..09fb2a47e 100644 --- a/resources/assets/js/components/Timeline.vue +++ b/resources/assets/js/components/Timeline.vue @@ -922,7 +922,8 @@ if(res.data.length > 0) { this.following.push(...res.data); this.followingCursor++; - } else { + } + if(res.data.length < 10) { this.followingMore = false; } }); @@ -939,11 +940,12 @@ if(res.data.length > 0) { this.followers.push(...res.data); this.followerCursor++; - } else { + } + if(res.data.length < 10) { this.followerMore = false; } }); } } } - \ No newline at end of file + From 46d8ff90f8f003220cfe05cece5a16c62cd0a0b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Thu, 28 Feb 2019 20:24:25 +0100 Subject: [PATCH 3/4] Update Profile.vue --- resources/assets/js/components/Profile.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/resources/assets/js/components/Profile.vue b/resources/assets/js/components/Profile.vue index f23371d67..b94230bd6 100644 --- a/resources/assets/js/components/Profile.vue +++ b/resources/assets/js/components/Profile.vue @@ -671,6 +671,9 @@ export default { .then(res => { this.following = res.data; this.followingCursor++; + if(res.data.length < 10) { + this.followingMore = false; + } }); this.$refs.followingModal.show(); }, @@ -688,6 +691,9 @@ export default { .then(res => { this.followers = res.data; this.followerCursor++; + if(res.data.length < 10) { + this.followerMore = false; + } }) this.$refs.followerModal.show(); }, From ea978dff456df99cfa50e3f1954d80fa38a0aa78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Thu, 28 Feb 2019 20:24:32 +0100 Subject: [PATCH 4/4] Update Timeline.vue --- resources/assets/js/components/Timeline.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/resources/assets/js/components/Timeline.vue b/resources/assets/js/components/Timeline.vue index 09fb2a47e..29ced3020 100644 --- a/resources/assets/js/components/Timeline.vue +++ b/resources/assets/js/components/Timeline.vue @@ -892,6 +892,9 @@ this.following = res.data; this.followingCursor++; }); + if(res.data.length < 10) { + this.followingMore = false; + } this.$refs.followingModal.show(); }, @@ -908,7 +911,10 @@ .then(res => { this.followers = res.data; this.followerCursor++; - }) + }) + if(res.data.length < 10) { + this.followerMore = false; + } this.$refs.followerModal.show(); },