diff options
| author | Shpuld Shpuldson <shp@cock.li> | 2020-11-19 12:38:35 +0200 |
|---|---|---|
| committer | Shpuld Shpuldson <shp@cock.li> | 2020-11-19 12:38:35 +0200 |
| commit | b1ab09b348014a8e70097158bda4d2e1226e4cb6 (patch) | |
| tree | 65740e91d81cbaaca444440a95713fdb2a46b849 /src/components/timeline/timeline.vue | |
| parent | 419df9d44673bf1abe3cda7ba6cafee9dd6eaba4 (diff) | |
| parent | d770bab1b0e5d543547c59d86aef533f77ceafe2 (diff) | |
fix merge conflict
Diffstat (limited to 'src/components/timeline/timeline.vue')
| -rw-r--r-- | src/components/timeline/timeline.vue | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 04859852..d4da2a87 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -2,22 +2,8 @@ <div :class="[classes.root, 'Timeline']"> <div :class="classes.header"> <TimelineMenu v-if="!embedded" /> - <div - v-if="timelineError" - class="loadmore-error alert error" - @click.prevent - > - {{ $t('timeline.error_fetching') }} - </div> - <div - v-else-if="errorData" - class="loadmore-error alert error" - @click.prevent - > - {{ errorData.statusText }} - </div> <button - v-else-if="showLoadButton" + v-if="showLoadButton" class="loadmore-button" @click.prevent="showNewStatuses" > @@ -76,18 +62,12 @@ {{ $t('timeline.no_more_statuses') }} </div> <a - v-else-if="!timeline.loading && !errorData" + v-else-if="!timeline.loading" 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" |