moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '415-timeline' into 'develop' 

Fix timeline updating bug when scrolled down

Closes #415

See merge request pleroma/pleroma-fe!644
This commit is contained in:
Shpuld Shpludson 2019-03-07 16:34:43 +00:00
parent 09b0f6dd87 aca3b37134
commit 82cd1252b5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/timeline/timeline.js
View File

@ -132,7 +132,9 @@ const Timeline = {
} }
if (count > 0) { if (count > 0) {
// only 'stream' them when you're scrolled to the top // 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.paused &&
!(this.unfocused && this.$store.state.config.pauseOnUnfocused) !(this.unfocused && this.$store.state.config.pauseOnUnfocused)
) { ) {