moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move pinned statuses showing logic in timeline

This commit is contained in:
taehoon 2019-07-19 22:40:37 -04:00
parent 4826d72549
commit ae829e8df1
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/timeline/timeline.vue
View File

@ -27,6 +27,18 @@
</div> </div>
</div> </div>
<div :class="classes.body"> <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"> <div class="timeline">
<conversation <conversation
v-for="status in statuses" v-for="status in statuses"

12
src/components/user_profile/user_profile.vue
View File

@ -15,18 +15,6 @@
:render-only-focused="true" :render-only-focused="true"
> >
<div :label="$t('user_card.statuses')"> <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 <Timeline
:count="user.statuses_count" :count="user.statuses_count"
:embedded="true" :embedded="true"