pleroma-fe

commit: 5328aca1efcdd09089bda9068efca9b940c2f6fa
parent: bda0a76c89cadc6251261a08575acf6986da1084
Author: Roger Braun <roger@rogerbraun.net>
Date:   Mon, 12 Jun 2017 16:34:41 +0200

Use userId in timeline.

Diffstat:
M
src/components/timeline/timeline.js
9
++++++---
M
src/components/user_profile/user_profile.vue
2
+-

2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
@@ -6,7 +6,8 @@ const Timeline = {
   props: [
     'timeline',
     'timelineName',
-    'title'
+    'title',
+    'userId'
   ],
   computed: {
     timelineError () { return this.$store.state.statuses.error }
@@ -26,7 +27,8 @@ const Timeline = {
       store,
       credentials,
       timeline: this.timelineName,
-      showImmediately
+      showImmediately,
+      userId: this.userId
     })
   },
   methods: {
@@ -42,7 +44,8 @@ const Timeline = {
         credentials,
         timeline: this.timelineName,
         older: true,
-        showImmediately: true
+        showImmediately: true,
+        userId: this.userId
       }).then(() => store.commit('setLoading', { timeline: this.timelineName, value: false }))
     },
     scrollLoad (e) {
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
@@ -3,7 +3,7 @@
     <div v-if="user" class="user-profile panel panel-default base00-background">
       <user-card-content :user="user"></user-card-content>
     </div>
-    <Timeline :title="'User Timeline'" v-bind:timeline="timeline" v-bind:timeline-name="'user'"/>
+    <Timeline :title="'User Timeline'" v-bind:timeline="timeline" v-bind:timeline-name="'user'" :user-id="userId"/>
   </div>
 </template>