diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-03-07 16:34:43 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-03-07 16:34:43 +0000 |
| commit | 82cd1252b58cce7fd32aafb89a21865715c23eb3 (patch) | |
| tree | 360dfc2255625d54bbc55c7c5ebd5eb86ca90d33 | |
| parent | 09b0f6dd87dcc8e0a03170bb84a9064009772824 (diff) | |
| parent | aca3b37134ef797f9c112f9584bf42dee1d9c87e (diff) | |
Merge branch '415-timeline' into 'develop'
Fix timeline updating bug when scrolled down
Closes #415
See merge request pleroma/pleroma-fe!644
| -rw-r--r-- | src/components/timeline/timeline.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index 655bfb3f..c45f8947 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -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) ) { |