diff options
| author | lambda <pleromagit@rogerbraun.net> | 2017-11-16 13:56:48 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2017-11-16 13:56:48 +0000 |
| commit | 86e685ac3452e42c3276e6ea2d3e7988abf2941a (patch) | |
| tree | a8e96d01cf0de16c603d87243902b56a3dc7bc25 /src | |
| parent | b1ddaf919839637f50ad5b6e4742b56f2e312c47 (diff) | |
| parent | 0b0d2062956b7dfc9ba3a513530d766bc3f9ae16 (diff) | |
Merge branch 'fix/timeline-softlock' into 'develop'
Fix timeline softlock when switching from a loading timeline
See merge request pleroma/pleroma-fe!164
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/timeline/timeline.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index 613b8a34..be0aefc1 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -60,6 +60,7 @@ const Timeline = { }, destroyed () { window.removeEventListener('scroll', this.scrollLoad) + this.$store.commit('setLoading', { timeline: this.timelineName, value: false }) }, methods: { showNewStatuses () { |