pleroma-fe

commit: c0b08d508c34fba9925e8e60c44ce3f818878e2b
parent: dcf030470dc42fbd518e3b4600b98cad1e06a84c
Author: Shpuld Shpuldson <shpuld@gmail.com>
Date:   Sat,  3 Jun 2017 12:59:05 -0400

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

Hotfix for firefox to prevent loading on every scroll event.

See merge request !86
Diffstat:
M
src/components/timeline/timeline.js
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git 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()
       }
     }