aboutsummaryrefslogtreecommitdiff
path: root/src/components/conversation
diff options
context:
space:
mode:
authortaehoon <th.dev91@gmail.com>2019-04-30 11:06:22 -0400
committertaehoon <th.dev91@gmail.com>2019-05-15 12:04:26 -0400
commitf68653d0dd0b374aa28eca35b424b6c834c701d6 (patch)
tree5ff6bd3a6849c704dfe47eae43748e9a473e5f4b /src/components/conversation
parent110c9d3b26e3871c8fc8157458be201ed4316d49 (diff)
show pinned state only in the user timeline
Diffstat (limited to 'src/components/conversation')
-rw-r--r--src/components/conversation/conversation.js3
-rw-r--r--src/components/conversation/conversation.vue1
2 files changed, 3 insertions, 1 deletions
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index ffeb7244..b3074590 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -41,7 +41,8 @@ const conversation = {
props: [
'statusoid',
'collapsable',
- 'isPage'
+ 'isPage',
+ 'showPinned'
],
created () {
if (this.isPage) {
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index d04ff722..0b4998c3 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -14,6 +14,7 @@
:inlineExpanded="collapsable && isExpanded"
:statusoid="status"
:expandable='!isExpanded'
+ :showPinned="showPinned"
:focused="focused(status.id)"
:inConversation="isExpanded"
:highlight="getHighlight()"