diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-08-18 08:24:56 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-08-18 08:24:56 +0000 |
| commit | 6504d8ca0ffaad9509fbbf3fc610d4a15538aead (patch) | |
| tree | 80c83a1ee5088fcbcfa14e2de5ffd03d408cd39f /src/components/conversation | |
| parent | 61f61947ad887c0cf8ee94ab7e699be78693579f (diff) | |
| parent | 4bedbfea3c315b67b1d5d0818880dde46b9af0b5 (diff) | |
Merge branch '640' into 'develop'
Fix "Mixed pin markers from multiple users"
Closes #640
See merge request pleroma/pleroma-fe!919
Diffstat (limited to 'src/components/conversation')
| -rw-r--r-- | src/components/conversation/conversation.js | 2 | ||||
| -rw-r--r-- | src/components/conversation/conversation.vue | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index a2b3aeab..19dcb257 100644 --- 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 index 5a900607..f184c071 100644 --- 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()" |