aboutsummaryrefslogtreecommitdiff
path: root/src/components/user_profile/user_profile.vue
diff options
context:
space:
mode:
authortaehoon <th.dev91@gmail.com>2019-04-24 13:56:53 -0400
committertaehoon <th.dev91@gmail.com>2019-05-15 12:04:25 -0400
commitcd0a7afa06cafc93510286d35a60e9e40ead36bf (patch)
tree91303c82172bab88bd9d5a91a0fb12ce4f05881a /src/components/user_profile/user_profile.vue
parent9e22d6212acaeba271d847b565d066ae92165d09 (diff)
remove pinned timeline, instead, use simple entity of user object
Diffstat (limited to 'src/components/user_profile/user_profile.vue')
-rw-r--r--src/components/user_profile/user_profile.vue19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index caf297c6..46561e2a 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -4,15 +4,16 @@
<UserCard :user="user" :switcher="true" :selected="timeline.viewing" rounded="top"/>
<tab-switcher :renderOnlyFocused="true" ref="tabSwitcher">
<div :label="$t('user_card.statuses')" :disabled="!user.statuses_count">
- <Timeline
- :count="user.statuses_count"
- :embedded="true"
- :title="$t('user_profile.timeline_title')"
- :timeline="pinned"
- :timeline-name="'pinned'"
- :user-id="userId"
- :no-load-more="true"
- />
+ <div class="timeline">
+ <Conversation
+ v-for="status in pinnedStatuses"
+ class="status-fadein"
+ :key="status.id"
+ :statusoid="status"
+ :pinned="true"
+ :collapsable="true"
+ />
+ </div>
<Timeline
:count="user.statuses_count"
:embedded="true"