Merge branch 'feature/autoloading-when-scrolled-to-bottom' into 'develop'

Hotfix for firefox to prevent loading on every scroll event.

See merge request !86

1 files changed, 2 insertions, 1 deletions

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 6070e442..7aaa81c8 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -46,7 +46,8 @@ const Timeline = {
       }).then(() => store.commit('setLoading', { timeline: this.timelineName, value: false }))
     },
     scrollLoad (e) {
-      if (this.timeline.loading === false && this.$store.state.config.autoLoad && (window.innerHeight + window.pageYOffset) >= (document.body.scrollHeight - 750)) {
+      let height = Math.max(document.body.offsetHeight, document.body.scrollHeight)
+      if (this.timeline.loading === false && this.$store.state.config.autoLoad && (window.innerHeight + window.pageYOffset) >= (height - 750)) {
         this.fetchOlderStatuses()
       }
     }