diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-07-28 21:05:22 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-07-28 21:05:22 +0000 |
| commit | 8aa3e7d52ea067c12dd12c711121fda190b5979d (patch) | |
| tree | 751002679ee4e672b3929b43b07fe61a06063ec7 /src/components/timeline/timeline.vue | |
| parent | 4827e4d972f8ee11e606693e24ae4ca21711c6b1 (diff) | |
| parent | 18a41e785ed85531f032a0aa1b6bfdce5a892fa9 (diff) | |
Merge branch '549' into 'develop'
Prevent showing pinned statuses twice
Closes #549
See merge request pleroma/pleroma-fe!812
Diffstat (limited to 'src/components/timeline/timeline.vue')
| -rw-r--r-- | src/components/timeline/timeline.vue | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 1fc52083..0cb4b3ef 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -28,13 +28,25 @@ </div> <div :class="classes.body"> <div class="timeline"> - <conversation - v-for="status in timeline.visibleStatuses" - :key="status.id" - class="status-fadein" - :statusoid="status" - :collapsable="true" - /> + <template v-for="statusId in pinnedStatusIds"> + <conversation + v-if="timeline.statusesObject[statusId]" + :key="statusId + '-pinned'" + class="status-fadein" + :statusoid="timeline.statusesObject[statusId]" + :collapsable="true" + :show-pinned="true" + /> + </template> + <template v-for="status in timeline.visibleStatuses"> + <conversation + v-if="!excludedStatusIdsObject[status.id]" + :key="status.id" + class="status-fadein" + :statusoid="status" + :collapsable="true" + /> + </template> </div> </div> <div :class="classes.footer"> |