commit: 6504d8ca0ffaad9509fbbf3fc610d4a15538aead
parent: 61f61947ad887c0cf8ee94ab7e699be78693579f
Author: Shpuld Shpludson <shp@cock.li>
Date: Sun, 18 Aug 2019 08:24:56 +0000
Merge branch '640' into 'develop'
Fix "Mixed pin markers from multiple users"
Closes #640
See merge request pleroma/pleroma-fe!919
Diffstat:
5 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
@@ -42,7 +42,7 @@ const conversation = {
'statusoid',
'collapsable',
'isPage',
- 'showPinned'
+ 'pinnedStatusIdsObject'
],
created () {
if (this.isPage) {
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
@@ -21,7 +21,7 @@
:inline-expanded="collapsable && isExpanded"
:statusoid="status"
:expandable="!isExpanded"
- :show-pinned="showPinned"
+ :show-pinned="pinnedStatusIdsObject && pinnedStatusIdsObject[status.id]"
:focused="focused(status.id)"
:in-conversation="isExpanded"
:highlight="getHighlight()"
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
@@ -32,7 +32,7 @@
</template>
<template v-else>
<div
- v-if="showPinned && statusoid.pinned"
+ v-if="showPinned"
class="status-pin"
>
<i class="fa icon-pin faint" />
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
@@ -58,7 +58,10 @@ const Timeline = {
excludedStatusIdsObject () {
const ids = getExcludedStatusIdsByPinning(this.timeline.visibleStatuses, this.pinnedStatusIds)
// Convert id array to object
- return keyBy(ids, id => id)
+ return keyBy(ids)
+ },
+ pinnedStatusIdsObject () {
+ return keyBy(this.pinnedStatusIds)
}
},
components: {
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
@@ -35,7 +35,7 @@
class="status-fadein"
:statusoid="timeline.statusesObject[statusId]"
:collapsable="true"
- :show-pinned="true"
+ :pinned-status-ids-object="pinnedStatusIdsObject"
/>
</template>
<template v-for="status in timeline.visibleStatuses">