diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-03-11 18:53:34 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-03-11 18:53:34 +0000 |
| commit | 7c26435e66fd7e142ea4b88fbe51eede32eeb5ce (patch) | |
| tree | d7b4ea789ceaaa8e5dacd7e74100962853853132 /src/components/timeline/timeline.js | |
| parent | 7e9c8c3d219aa3b787c5606efbb54a73c1738b07 (diff) | |
| parent | f397537642a6b8a4079d8d45d835ddd50f2d2b4a (diff) | |
Merge branch 'develop' into 'master'
Update master with bugfixes (and other changes)
See merge request pleroma/pleroma-fe!673
Diffstat (limited to 'src/components/timeline/timeline.js')
| -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) ) { |