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/timeline | |
| 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/timeline')
| -rw-r--r-- | src/components/timeline/timeline.js | 5 | ||||
| -rw-r--r-- | src/components/timeline/timeline.vue | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index aac3869f..8df48f7f 100644 --- 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 index 0cb4b3ef..4ad51714 100644 --- 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"> |