From ae829e8df13f2b9c18b3e5488ebe265e2669e759 Mon Sep 17 00:00:00 2001 From: taehoon <th.dev91@gmail.com> Date: Fri, 19 Jul 2019 22:40:37 -0400 Subject: [PATCH] move pinned statuses showing logic in timeline --- src/components/timeline/timeline.vue | 12 ++++++++++++ src/components/user_profile/user_profile.vue | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 623f65d7..9990f20a 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -27,6 +27,18 @@ </div> </div> <div :class="classes.body"> + <div class="timeline"> + <template v-for="statusId in pinnedStatusIds"> + <conversation + v-if="timeline.statusesObject[statusId]" + :key="statusId" + class="status-fadein" + :statusoid="timeline.statusesObject[statusId]" + :collapsable="true" + :show-pinned="true" + /> + </template> + </div> <div class="timeline"> <conversation v-for="status in statuses" diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index 81c63d7e..f4b284e2 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -15,18 +15,6 @@ :render-only-focused="true" > <div :label="$t('user_card.statuses')"> - <div class="timeline"> - <template v-for="statusId in user.pinnedStatuseIds"> - <Conversation - v-if="timeline.statusesObject[statusId]" - :key="statusId" - class="status-fadein" - :statusoid="timeline.statusesObject[statusId]" - :collapsable="true" - :show-pinned="true" - /> - </template> - </div> <Timeline :count="user.statuses_count" :embedded="true"