diff options
| author | lain <lain@soykaf.club> | 2020-07-01 12:46:42 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-07-01 12:46:42 +0000 |
| commit | beb160bd537abcb7f2e147c7954886d2f51d385f (patch) | |
| tree | 332eb88bacbc6a11f61808280edaec50ebf48bbb /src/components/timeline/timeline.vue | |
| parent | 82944f862d07db46cf342f2ee75b2ab6ddccc4fc (diff) | |
| parent | 38d8526660df4ca664c9ea50a660868be2cb5e49 (diff) | |
Merge branch 'fix/use-backend-reply-filtering' into 'develop'
Make use of backend reply filtering
See merge request pleroma/pleroma-fe!1163
Diffstat (limited to 'src/components/timeline/timeline.vue')
| -rw-r--r-- | src/components/timeline/timeline.vue | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 9777bd0c..111c0976 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -19,14 +19,14 @@ {{ errorData.statusText }} </div> <button - v-if="timeline.newStatusCount > 0 && !timelineError && !errorData" + v-else-if="showLoadButton" class="loadmore-button" @click.prevent="showNewStatuses" > - {{ $t('timeline.show_new') }}{{ newStatusCountStr }} + {{ loadButtonString }} </button> <div - v-if="!timeline.newStatusCount > 0 && !timelineError && !errorData" + v-else class="loadmore-text faint" @click.prevent > |