diff options
| author | kaniini <nenolod@gmail.com> | 2018-08-20 00:02:59 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-08-20 00:02:59 +0000 |
| commit | 65dfceae59de8c0a8d79168f345d16942695c573 (patch) | |
| tree | e6faadd73fd3bc969693048f318f671ef22e56cd /src/components/timeline/timeline.js | |
| parent | d6b3394b790b72899b691e13196d05ec097ae1cc (diff) | |
| parent | 702dfcec10290e86d04aa77fb921a64b6e7beb12 (diff) | |
Merge branch 'fixes-and-tweaks' into 'develop'
Fixes and tweaks
See merge request pleroma/pleroma-fe!307
Diffstat (limited to 'src/components/timeline/timeline.js')
| -rw-r--r-- | src/components/timeline/timeline.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index 5c179567..a651f619 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -133,7 +133,10 @@ const Timeline = { } if (count > 0) { // only 'stream' them when you're scrolled to the top - if (window.pageYOffset < 15 && !this.paused && !this.unfocused) { + if (window.pageYOffset < 15 && + !this.paused && + !(this.unfocused && this.$store.state.config.pauseOnUnfocused) + ) { this.showNewStatuses() } else { this.paused = true |