From 1455e1f9d50dc85b4467f410e6119480b6d1ebf1 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Mon, 6 May 2019 15:29:24 -0400
Subject: eliminate expandable prop in favor of inConversation

---
 src/components/conversation/conversation.vue | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/components/conversation/conversation.vue')

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()"
-- 
cgit v1.2.3-70-g09d2


From 1a3799bfacd70fc51bc58a5a8b7ac2c88f9ed7dd Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Mon, 6 May 2019 16:16:43 -0400
Subject: fix wrong inlineExpanded

---
 src/components/conversation/conversation.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/components/conversation/conversation.vue')

diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index ff5b8168..877d65ec 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -11,7 +11,7 @@
       @goto="setHighlight"
       @toggleExpanded="toggleExpanded"
       :key="status.id"
-      :inlineExpanded="collapsable"
+      :inlineExpanded="collapsable && isExpanded"
       :statusoid="status"
       :focused="focused(status.id)"
       :inConversation="isExpanded"
-- 
cgit v1.2.3-70-g09d2


From 917e82e8eedb231cee0b1f6e95ac9c5dbba03e35 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Mon, 6 May 2019 21:36:55 -0400
Subject: Revert "eliminate expandable prop in favor of inConversation"

This reverts commit 1455e1f9d50dc85b4467f410e6119480b6d1ebf1.
---
 src/components/conversation/conversation.vue | 1 +
 src/components/status/status.js              | 1 +
 src/components/status/status.vue             | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/components/conversation/conversation.vue')

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>
-- 
cgit v1.2.3-70-g09d2