diff options
| author | lambda <pleromagit@rogerbraun.net> | 2019-01-30 17:49:27 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2019-01-30 17:49:27 +0000 |
| commit | 1717e700469cb6331e2905c7af0d384cf78a1188 (patch) | |
| tree | 8bb0b6f4fa6c8b81c697abc3fb707e4750f66004 /src/components/notifications/notifications.vue | |
| parent | 0bd77149a06bcd7e0a904d0f5c2e2691996ff898 (diff) | |
| parent | 7666d50d8a9eb2ef8b5a61a1689b7358ae7d93ea (diff) | |
Merge branch 'feat/dont-show-load-more-when-bottomed-out' into 'develop'
fix #292 dont show "load more" when bottomed out
Closes #292
See merge request pleroma/pleroma-fe!496
Diffstat (limited to 'src/components/notifications/notifications.vue')
| -rw-r--r-- | src/components/notifications/notifications.vue | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue index 64f18720..6f162b62 100644 --- a/src/components/notifications/notifications.vue +++ b/src/components/notifications/notifications.vue @@ -18,10 +18,15 @@ </div> </div> <div class="panel-footer"> - <a href="#" v-on:click.prevent='fetchOlderNotifications()' v-if="!notifications.loading"> + <div v-if="bottomedOut" class="new-status-notification text-center panel-footer faint"> + {{$t('notifications.no_more_notifications')}} + </div> + <a v-else-if="!loading" href="#" v-on:click.prevent="fetchOlderNotifications()"> <div class="new-status-notification text-center panel-footer">{{$t('notifications.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> </div> |