diff options
| author | feld <feld@feld.me> | 2019-12-13 17:02:09 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2019-12-13 17:02:09 +0000 |
| commit | 749a3999449fa5d5cf366a3b636be4590d93729c (patch) | |
| tree | b38aa6b0c60e9ba96f00dd4ac433f5d976612429 /src/components/timeline/timeline.vue | |
| parent | 0b49e798e0737728e94ff8a284a4570acc7bac28 (diff) | |
| parent | 8ee80339555c53d45602f40fdbe6b487a6992515 (diff) | |
Merge branch 'issue_124' into 'develop'
Change 403 messaging
See merge request pleroma/pleroma-fe!1020
Diffstat (limited to 'src/components/timeline/timeline.vue')
| -rw-r--r-- | src/components/timeline/timeline.vue | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index a6fba452..9777bd0c 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -11,15 +11,22 @@ > {{ $t('timeline.error_fetching') }} </div> + <div + v-else-if="errorData" + class="loadmore-error alert error" + @click.prevent + > + {{ errorData.statusText }} + </div> <button - v-if="timeline.newStatusCount > 0 && !timelineError" + v-if="timeline.newStatusCount > 0 && !timelineError && !errorData" class="loadmore-button" @click.prevent="showNewStatuses" > {{ $t('timeline.show_new') }}{{ newStatusCountStr }} </button> <div - v-if="!timeline.newStatusCount > 0 && !timelineError" + v-if="!timeline.newStatusCount > 0 && !timelineError && !errorData" class="loadmore-text faint" @click.prevent > @@ -67,12 +74,18 @@ {{ $t('timeline.no_more_statuses') }} </div> <a - v-else-if="!timeline.loading" + v-else-if="!timeline.loading && !errorData" href="#" @click.prevent="fetchOlderStatuses()" > <div class="new-status-notification text-center panel-footer">{{ $t('timeline.load_older') }}</div> </a> + <a + v-else-if="errorData" + href="#" + > + <div class="new-status-notification text-center panel-footer">{{ errorData.error }}</div> + </a> <div v-else class="new-status-notification text-center panel-footer" |