aboutsummaryrefslogtreecommitdiff
path: root/src/components/timeline/timeline.js
diff options
context:
space:
mode:
authorlambadalambda <gitgud@rogerbraun.net>2017-09-17 07:58:05 -0400
committerlambadalambda <gitgud@rogerbraun.net>2017-09-17 07:58:05 -0400
commit91991e2ac1765a17bc5cd0038507c577a0d12045 (patch)
tree3b76538396254fdcddf49e8b73d32db4ae41ee5c /src/components/timeline/timeline.js
parent3eaaa4c16de3355e47d1a8c5c74e19cc492e37a5 (diff)
parentc96a7b582bfc12b4af437fbd0d75ed8762065288 (diff)
Merge branch 'feature/tag-timelines' into 'develop'
Add tag timeline view. See merge request !121
Diffstat (limited to 'src/components/timeline/timeline.js')
-rw-r--r--src/components/timeline/timeline.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 06435745..bd80d57b 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -8,7 +8,8 @@ const Timeline = {
'timeline',
'timelineName',
'title',
- 'userId'
+ 'userId',
+ 'tag'
],
computed: {
timelineError () { return this.$store.state.statuses.error },
@@ -39,7 +40,8 @@ const Timeline = {
credentials,
timeline: this.timelineName,
showImmediately,
- userId: this.userId
+ userId: this.userId,
+ tag: this.tag
})
// don't fetch followers for public, friend, twkn
@@ -62,7 +64,8 @@ const Timeline = {
timeline: this.timelineName,
older: true,
showImmediately: true,
- userId: this.userId
+ userId: this.userId,
+ tag: this.tag
}).then(() => store.commit('setLoading', { timeline: this.timelineName, value: false }))
},
fetchFollowers () {