From 214ab22c4ccc92ddee537204c1c29a1dacb037b8 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Fri, 30 Aug 2019 11:52:58 -0400
Subject: update prop binding

---
 src/components/timeline/timeline.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 4ad51714..14ce21af 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -33,7 +33,7 @@
             v-if="timeline.statusesObject[statusId]"
             :key="statusId + '-pinned'"
             class="status-fadein"
-            :statusoid="timeline.statusesObject[statusId]"
+            :statusoid="statusId"
             :collapsable="true"
             :pinned-status-ids-object="pinnedStatusIdsObject"
           />
@@ -43,7 +43,7 @@
             v-if="!excludedStatusIdsObject[status.id]"
             :key="status.id"
             class="status-fadein"
-            :statusoid="status"
+            :statusoid="status.id"
             :collapsable="true"
           />
         </template>
-- 
cgit v1.2.3-70-g09d2


From 9727009147d541bc8ab7083791a531b39f29c614 Mon Sep 17 00:00:00 2001
From: taehoon <th.dev91@gmail.com>
Date: Tue, 3 Sep 2019 13:19:14 -0400
Subject: update prop name

---
 .../conversation-page/conversation-page.vue        |  2 +-
 src/components/conversation/conversation.js        | 24 +++++++++++-----------
 src/components/timeline/timeline.vue               |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

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

diff --git a/src/components/conversation-page/conversation-page.vue b/src/components/conversation-page/conversation-page.vue
index 3db63343..8cc0a55f 100644
--- a/src/components/conversation-page/conversation-page.vue
+++ b/src/components/conversation-page/conversation-page.vue
@@ -2,7 +2,7 @@
   <conversation
     :collapsable="false"
     is-page="true"
-    :statusoid="statusId"
+    :status-id="statusId"
   />
 </template>
 
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index dc58cd58..10dd8eb0 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -39,7 +39,7 @@ const conversation = {
     }
   },
   props: [
-    'statusoid',
+    'statusId',
     'collapsable',
     'isPage',
     'pinnedStatusIdsObject'
@@ -51,17 +51,17 @@ const conversation = {
   },
   computed: {
     status () {
-      return this.$store.state.statuses.allStatusesObject[this.statusoid]
+      return this.$store.state.statuses.allStatusesObject[this.statusId]
     },
-    statusId () {
+    originalStatusId () {
       if (this.status.retweeted_status) {
         return this.status.retweeted_status.id
       } else {
-        return this.statusoid
+        return this.statusId
       }
     },
     conversationId () {
-      return this.getConversationId(this.statusoid)
+      return this.getConversationId(this.statusId)
     },
     conversation () {
       if (!this.status) {
@@ -73,7 +73,7 @@ const conversation = {
       }
 
       const conversation = clone(this.$store.state.statuses.conversationsObject[this.conversationId])
-      const statusIndex = findIndex(conversation, { id: this.statusId })
+      const statusIndex = findIndex(conversation, { id: this.originalStatusId })
       if (statusIndex !== -1) {
         conversation[statusIndex] = this.status
       }
@@ -106,11 +106,11 @@ const conversation = {
     Status
   },
   watch: {
-    statusoid (newVal, oldVal) {
+    statusId (newVal, oldVal) {
       const newConversationId = this.getConversationId(newVal)
       const oldConversationId = this.getConversationId(oldVal)
       if (newConversationId && oldConversationId && newConversationId === oldConversationId) {
-        this.setHighlight(this.statusId)
+        this.setHighlight(this.originalStatusId)
       } else {
         this.fetchConversation()
       }
@@ -124,14 +124,14 @@ const conversation = {
   methods: {
     fetchConversation () {
       if (this.status) {
-        this.$store.state.api.backendInteractor.fetchConversation({ id: this.statusoid })
+        this.$store.state.api.backendInteractor.fetchConversation({ id: this.statusId })
           .then(({ ancestors, descendants }) => {
             this.$store.dispatch('addNewStatuses', { statuses: ancestors })
             this.$store.dispatch('addNewStatuses', { statuses: descendants })
-            this.setHighlight(this.statusId)
+            this.setHighlight(this.originalStatusId)
           })
       } else {
-        this.$store.state.api.backendInteractor.fetchStatus({ id: this.statusoid })
+        this.$store.state.api.backendInteractor.fetchStatus({ id: this.statusId })
           .then((status) => {
             this.$store.dispatch('addNewStatuses', { statuses: [status] })
             this.fetchConversation()
@@ -142,7 +142,7 @@ const conversation = {
       return this.replies[id] || []
     },
     focused (id) {
-      return (this.isExpanded) && id === this.statusoid
+      return (this.isExpanded) && id === this.statusId
     },
     setHighlight (id) {
       if (!id) return
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 14ce21af..ba66e6da 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -33,7 +33,7 @@
             v-if="timeline.statusesObject[statusId]"
             :key="statusId + '-pinned'"
             class="status-fadein"
-            :statusoid="statusId"
+            :status-id="statusId"
             :collapsable="true"
             :pinned-status-ids-object="pinnedStatusIdsObject"
           />
@@ -43,7 +43,7 @@
             v-if="!excludedStatusIdsObject[status.id]"
             :key="status.id"
             class="status-fadein"
-            :statusoid="status.id"
+            :status-id="status.id"
             :collapsable="true"
           />
         </template>
-- 
cgit v1.2.3-70-g09d2

