diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-09-16 11:38:37 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-09-16 11:38:37 +0000 |
| commit | 1306fac38f46b5578d46cc6abd6168a3399886b1 (patch) | |
| tree | 9e92df60075bee0285e6b34d8b433cb6065f3b3f /src/components/timeline | |
| parent | b33667a74342a9fc91386d12763b5c2f1101868a (diff) | |
| parent | 9b163d281670e0c0a589adce46727284fbcba0ad (diff) | |
Merge branch 'develop' into 'muting-fixes'
# Conflicts:
# src/components/status/status.js
Diffstat (limited to 'src/components/timeline')
| -rw-r--r-- | src/components/timeline/timeline.js | 3 | ||||
| -rw-r--r-- | src/components/timeline/timeline.vue | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index 8df48f7f..0594576c 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -25,7 +25,8 @@ const Timeline = { 'tag', 'embedded', 'count', - 'pinnedStatusIds' + 'pinnedStatusIds', + 'inProfile' ], data () { return { diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 4ad51714..f1d3903a 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -33,9 +33,10 @@ v-if="timeline.statusesObject[statusId]" :key="statusId + '-pinned'" class="status-fadein" - :statusoid="timeline.statusesObject[statusId]" + :status-id="statusId" :collapsable="true" :pinned-status-ids-object="pinnedStatusIdsObject" + :in-profile="inProfile" /> </template> <template v-for="status in timeline.visibleStatuses"> @@ -43,8 +44,9 @@ v-if="!excludedStatusIdsObject[status.id]" :key="status.id" class="status-fadein" - :statusoid="status" + :status-id="status.id" :collapsable="true" + :in-profile="inProfile" /> </template> </div> |