From 493d542d9292f580460ddec78f9083b9fbae99ec Mon Sep 17 00:00:00 2001 From: dave Date: Tue, 12 Feb 2019 05:10:27 -0500 Subject: [PATCH 1/2] #341 - automatic scroll with repeats/reports --- src/components/conversation/conversation.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index c18781de..93e168d7 100644 --- a/src/components/conversation/conversation.js +++ b/src/components/conversation/conversation.js @@ -36,6 +36,13 @@ const conversation = { status () { return this.statusoid }, + actualId () { + if (this.statusoid.retweeted_status) { + return this.statusoid.retweeted_status.id + } else { + return this.statusoid.id + } + }, conversation () { if (!this.status) { return [] @@ -79,7 +86,7 @@ const conversation = { const conversationId = this.status.statusnet_conversation_id this.$store.state.api.backendInteractor.fetchConversation({id: conversationId}) .then((statuses) => this.$store.dispatch('addNewStatuses', { statuses })) - .then(() => this.setHighlight(this.statusoid.id)) + .then(() => this.setHighlight(this.actualId)) } else { const id = this.$route.params.id this.$store.state.api.backendInteractor.fetchStatus({id}) @@ -91,11 +98,7 @@ const conversation = { return this.replies[id] || [] }, focused (id) { - if (this.statusoid.retweeted_status) { - return (id === this.statusoid.retweeted_status.id) - } else { - return (id === this.statusoid.id) - } + return id === this.actualId }, setHighlight (id) { this.highlight = id From 25bb80a9820681f44fb6684d7cddd5b3457e4d80 Mon Sep 17 00:00:00 2001 From: dave Date: Tue, 12 Feb 2019 10:35:54 -0500 Subject: [PATCH 2/2] #341 - fix naming --- src/components/conversation/conversation.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index 93e168d7..2f7852b8 100644 --- a/src/components/conversation/conversation.js +++ b/src/components/conversation/conversation.js @@ -36,7 +36,7 @@ const conversation = { status () { return this.statusoid }, - actualId () { + statusId () { if (this.statusoid.retweeted_status) { return this.statusoid.retweeted_status.id } else { @@ -86,7 +86,7 @@ const conversation = { const conversationId = this.status.statusnet_conversation_id this.$store.state.api.backendInteractor.fetchConversation({id: conversationId}) .then((statuses) => this.$store.dispatch('addNewStatuses', { statuses })) - .then(() => this.setHighlight(this.actualId)) + .then(() => this.setHighlight(this.statusId)) } else { const id = this.$route.params.id this.$store.state.api.backendInteractor.fetchStatus({id}) @@ -98,7 +98,7 @@ const conversation = { return this.replies[id] || [] }, focused (id) { - return id === this.actualId + return id === this.statusId }, setHighlight (id) { this.highlight = id