Skip to content
Snippets Groups Projects
Commit 82cd1252 authored by Shpuld Shpludson's avatar Shpuld Shpludson
Browse files

Merge branch '415-timeline' into 'develop'

Fix timeline updating bug when scrolled down

Closes #415

See merge request pleroma/pleroma-fe!644
parents 09b0f6dd aca3b371
No related branches found
No related tags found
No related merge requests found
......@@ -132,7 +132,9 @@ const Timeline = {
}
if (count > 0) {
// only 'stream' them when you're scrolled to the top
if (window.pageYOffset < 15 &&
const doc = document.documentElement
const top = (window.pageYOffset || doc.scrollTop) - (doc.clientTop || 0)
if (top < 15 &&
!this.paused &&
!(this.unfocused && this.$store.state.config.pauseOnUnfocused)
) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment