diff options
| author | shpuld <shp@cock.li> | 2019-01-30 20:49:24 +0200 |
|---|---|---|
| committer | shpuld <shp@cock.li> | 2019-01-30 20:49:24 +0200 |
| commit | c7cffbb6c70bbb21cf787d96e82e0261427b9234 (patch) | |
| tree | a517e4942725286b173b685cbe87bc6c7878b66e /src/components/timeline/timeline.vue | |
| parent | 51024a2c8af9d88b07c050b7502fa62843aa4ba2 (diff) | |
| parent | b1facdf7ad54436c2afde7c28c917cda87a5b7e3 (diff) | |
Merge branch 'develop' into feat/media-modal
Diffstat (limited to 'src/components/timeline/timeline.vue')
| -rw-r--r-- | src/components/timeline/timeline.vue | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 6ba598c5..e3eea3bd 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -20,10 +20,15 @@ </div> </div> <div :class="classes.footer"> - <a href="#" v-on:click.prevent='fetchOlderStatuses()' v-if="!timeline.loading"> + <div v-if="bottomedOut" class="new-status-notification text-center panel-footer faint"> + {{$t('timeline.no_more_statuses')}} + </div> + <a v-else-if="!timeline.loading" href="#" v-on:click.prevent='fetchOlderStatuses()'> <div class="new-status-notification text-center panel-footer">{{$t('timeline.load_older')}}</div> </a> - <div class="new-status-notification text-center panel-footer" v-else>...</div> + <div v-else class="new-status-notification text-center panel-footer"> + <i class="icon-spin3 animate-spin"/> + </div> </div> </div> </template> |