aboutsummaryrefslogtreecommitdiff
path: root/src/components/user_profile/user_profile.vue
diff options
context:
space:
mode:
authordave <starpumadev@gmail.com>2019-04-04 15:10:34 -0400
committertaehoon <th.dev91@gmail.com>2019-05-15 12:04:24 -0400
commit2c89d49a3d22ed2813a6a57fb6049341fa8624ba (patch)
tree4e7e97bdadc4a1aeeac28a8258c429a991efecb2 /src/components/user_profile/user_profile.vue
parente28b19645aa6a546f8d1980fa479f20d3c48ff36 (diff)
#468 - show pinned timeline and add pinned label to the status
Diffstat (limited to 'src/components/user_profile/user_profile.vue')
-rw-r--r--src/components/user_profile/user_profile.vue29
1 files changed, 19 insertions, 10 deletions
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 71c625b7..caf297c6 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -3,16 +3,25 @@
<div v-if="user" class="user-profile panel panel-default">
<UserCard :user="user" :switcher="true" :selected="timeline.viewing" rounded="top"/>
<tab-switcher :renderOnlyFocused="true" ref="tabSwitcher">
- <Timeline
- :label="$t('user_card.statuses')"
- :disabled="!user.statuses_count"
- :count="user.statuses_count"
- :embedded="true"
- :title="$t('user_profile.timeline_title')"
- :timeline="timeline"
- :timeline-name="'user'"
- :user-id="userId"
- />
+ <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"
+ />
+ <Timeline
+ :count="user.statuses_count"
+ :embedded="true"
+ :title="$t('user_profile.timeline_title')"
+ :timeline="timeline"
+ :timeline-name="'user'"
+ :user-id="userId"
+ />
+ </div>
<div :label="$t('user_card.followees')" v-if="followsTabVisible" :disabled="!user.friends_count">
<FriendList :userId="userId">
<template slot="item" slot-scope="{item}">