Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into feature/custom-theme

2017-11-17 02:17:47 +02:00 · 2017-11-17 02:17:47 +02:00 · e13c8c3fd2
commit e13c8c3fd2
parent 44073e72fd 86e685ac34
12 changed files with 132 additions and 70 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 () {