commit: 86e685ac3452e42c3276e6ea2d3e7988abf2941a
parent: b1ddaf919839637f50ad5b6e4742b56f2e312c47
Author: lambda <pleromagit@rogerbraun.net>
Date: Thu, 16 Nov 2017 13:56:48 +0000
Merge branch 'fix/timeline-softlock' into 'develop'
Fix timeline softlock when switching from a loading timeline
See merge request pleroma/pleroma-fe!164
Diffstat:
1 file changed, 1 insertion(+), 0 deletions(-)
diff --git 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 () {