diff options
| author | taehoon <th.dev91@gmail.com> | 2019-05-06 21:36:55 -0400 |
|---|---|---|
| committer | taehoon <th.dev91@gmail.com> | 2019-05-06 21:36:55 -0400 |
| commit | 917e82e8eedb231cee0b1f6e95ac9c5dbba03e35 (patch) | |
| tree | 6cc094ea930d162968d790b7085f5574bc88c310 | |
| parent | 134b1894d69074c0b51814888faa57c09f610e99 (diff) | |
Revert "eliminate expandable prop in favor of inConversation"
This reverts commit 1455e1f9d50dc85b4467f410e6119480b6d1ebf1.
| -rw-r--r-- | src/components/conversation/conversation.vue | 1 | ||||
| -rw-r--r-- | src/components/status/status.js | 1 | ||||
| -rw-r--r-- | src/components/status/status.vue | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 877d65ec..d04ff722 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -13,6 +13,7 @@ :key="status.id" :inlineExpanded="collapsable && isExpanded" :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 123caf16..c01cfe79 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -18,6 +18,7 @@ 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 495d088d..43c3030e 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="!inConversation && !isPreview"> + <template v-if="expandable && !isPreview"> <a href="#" @click.prevent="toggleExpanded" title="Expand"> <i class="button-icon icon-plus-squared"></i> </a> |