aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortaehoon <th.dev91@gmail.com>2019-05-06 15:29:24 -0400
committertaehoon <th.dev91@gmail.com>2019-05-06 15:29:24 -0400
commit1455e1f9d50dc85b4467f410e6119480b6d1ebf1 (patch)
tree1322e2b2980ce30a88439f0f33a519f9dc5f7ae5 /src
parent081f9a926aa55aa8d4aa8d1cd9ad91ff5ec84880 (diff)
eliminate expandable prop in favor of inConversation
Diffstat (limited to 'src')
-rw-r--r--src/components/conversation/conversation.vue1
-rw-r--r--src/components/status/status.js1
-rw-r--r--src/components/status/status.vue2
3 files changed, 1 insertions, 3 deletions
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index c3bbb597..ff5b8168 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -13,7 +13,6 @@
:key="status.id"
:inlineExpanded="collapsable"
:statusoid="status"
- :expandable='!isExpanded'
:focused="focused(status.id)"
:inConversation="isExpanded"
:highlight="getHighlight()"
diff --git a/src/components/status/status.js b/src/components/status/status.js
index ff8cbe18..a47b22a7 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -18,7 +18,6 @@ const Status = {
name: 'Status',
props: [
'statusoid',
- 'expandable',
'inConversation',
'focused',
'highlight',
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 43c3030e..495d088d 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -52,7 +52,7 @@
<a :href="status.external_url" target="_blank" v-if="!status.is_local && !isPreview" class="source_url" title="Source">
<i class="button-icon icon-link-ext-alt"></i>
</a>
- <template v-if="expandable && !isPreview">
+ <template v-if="!inConversation && !isPreview">
<a href="#" @click.prevent="toggleExpanded" title="Expand">
<i class="button-icon icon-plus-squared"></i>
</a>