diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/timeline/timeline.js | 14 | ||||
| -rw-r--r-- | src/components/timeline/timeline.vue | 16 |
2 files changed, 19 insertions, 11 deletions
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index 7c8a761a..b1413591 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -41,12 +41,18 @@ const Timeline = { footer: ['timeline-footer'].concat(!this.embedded ? ['panel-footer'] : []) } }, - statuses () { + // id map of statuses which need to be hidden in the main list due to pinning logic + excludedStatusIdsObject () { + const result = {} if (this.pinnedStatusIds && this.pinnedStatusIds.length > 0) { - return this.timeline.visibleStatuses && this.timeline.visibleStatuses.filter(status => !this.pinnedStatusIds.includes(status.id)) - } else { - return this.timeline.visibleStatuses + for (let status of this.timeline.visibleStatuses) { + if (this.pinnedStatusIds.indexOf(status.id) === -1) { + break + } + result[status.id] = true + } } + return result } }, components: { diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 4337ac36..0cb4b3ef 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -38,13 +38,15 @@ :show-pinned="true" /> </template> - <conversation - v-for="status in statuses" - :key="status.id" - class="status-fadein" - :statusoid="status" - :collapsable="true" - /> + <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"> |