Merge branch 'fix/timeline-softlock' into 'develop'

Fix timeline softlock when switching from a loading timeline See merge request pleroma/pleroma-fe!164
2017-11-16 13:56:48 +00:00 · 2017-11-16 13:56:48 +00:00 · 86e685ac34
parent b1ddaf9198 0b0d206295
commit 86e685ac34
1 changed files with 1 additions and 0 deletions
--- 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 () {