diff options
Diffstat (limited to 'src/components/timeline')
| -rw-r--r-- | src/components/timeline/timeline.js | 2 | ||||
| -rw-r--r-- | src/components/timeline/timeline.vue | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index 660a8752..74ab85d3 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -105,7 +105,7 @@ const Timeline = { .then((friends) => this.$store.dispatch('addFriends', { friends })) }, scrollLoad (e) { - let height = Math.max(document.body.offsetHeight, document.body.scrollHeight) + const height = Math.max(document.body.offsetHeight, document.body.scrollHeight) if (this.timeline.loading === false && this.$store.state.config.autoLoad && this.$el.offsetHeight > 0 && diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 4d2230cb..03f6ad3d 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -16,13 +16,15 @@ </div> <div class="panel-body"> <div class="timeline"> - <status-or-conversation v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status"></status-or-conversation> - <a href="#" v-on:click.prevent='fetchOlderStatuses()' v-if="!timeline.loading"> - <div class="new-status-notification text-center">{{$t('timeline.load_older')}}</div> - </a> - <div class="new-status-notification text-center" v-else>...</div> + <status-or-conversation v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status" class="status-fadein"></status-or-conversation> </div> </div> + <div class="panel-footer"> + <a href="#" v-on:click.prevent='fetchOlderStatuses()' v-if="!timeline.loading"> + <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> </div> <div class="timeline panel panel-default" v-else-if="viewing == 'followers'"> <div class="panel-heading timeline-heading"> |