aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorwakarimasen <wakarimasen@airmail.cc>2017-03-05 16:31:01 +0100
committerwakarimasen <wakarimasen@airmail.cc>2017-03-05 16:31:01 +0100
commit289326855caa5e763439f89f2829c430056e79c3 (patch)
tree6a538327177a109f292e1cf6ec281e97c12e2f96 /src
parent22e8258a56ab0828231bc0e510b52dd39eebb5c7 (diff)
Add focused prop to status
Diffstat (limited to 'src')
-rw-r--r--src/components/conversation/conversation.js3
-rw-r--r--src/components/conversation/conversation.vue2
-rw-r--r--src/components/status/status.js7
-rw-r--r--src/components/status_or_conversation/status_or_conversation.vue2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index ecc76e71..524737fd 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -47,6 +47,9 @@ const conversation = {
.then((status) => this.$store.dispatch('addNewStatuses', { statuses: [status] }))
.then(() => this.fetchConversation())
}
+ },
+ focused: function(id) {
+ return (id == this.statusoid.id)
}
}
}
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 9675e69f..8803dd57 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -8,7 +8,7 @@
</div>
<div class="panel-body">
<div class="timeline">
- <status v-for="status in conversation" :key="status.id" v-bind:statusoid="status":expandable='false'></status>
+ <status v-for="status in conversation" :key="status.id" v-bind:statusoid="status":expandable='false':focused="focused(status.id)"></status>
</div>
</div>
</div>
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 9550c19f..f1682e68 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -9,7 +9,8 @@ import { toInteger } from 'lodash'
const Status = {
props: [
'statusoid',
- 'expandable'
+ 'expandable',
+ 'focused'
],
data: () => ({
replying: false,
@@ -32,10 +33,6 @@ const Status = {
return !!this.$store.state.users.currentUser
},
muted () { return !this.unmuted && this.status.user.muted },
- focused () {
- const id = toInteger(this.$route.params.id)
- return (this.statusoid.id == id)
- },
isReply () { return !!this.statusoid.in_reply_to_status_id }
},
components: {
diff --git a/src/components/status_or_conversation/status_or_conversation.vue b/src/components/status_or_conversation/status_or_conversation.vue
index 4fabfab2..4aaaf2ff 100644
--- a/src/components/status_or_conversation/status_or_conversation.vue
+++ b/src/components/status_or_conversation/status_or_conversation.vue
@@ -1,7 +1,7 @@
<template>
<div>
<conversation v-if="expanded" @toggleExpanded="toggleExpanded" :collapsable="true" :statusoid="statusoid"></conversation>
- <status v-if="!expanded" @toggleExpanded="toggleExpanded" :expandable="true" :statusoid="statusoid"></status>
+ <status v-if="!expanded" @toggleExpanded="toggleExpanded" :expandable="true" :statusoid="statusoid" :focused="false"></status>
</div>
</template>