diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-07-13 13:25:23 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-07-13 13:25:23 -0500 |
| commit | da94935aaa18f16ac7fbe715c4610427d68ccf72 (patch) | |
| tree | 52691b7cbac2773858b245e596d56c1c5e6ea74b /src/components/timeline/timeline.vue | |
| parent | 2eda3d687e8c986a982057c6f5eb969aa8d403d5 (diff) | |
| parent | 3e09a708f600b47dde831eeddb412828b38a0cf4 (diff) | |
Merge branch 'develop' into refactor/notification_settings
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 > |