aboutsummaryrefslogtreecommitdiff
path: root/src/components/conversation/conversation.js
diff options
context:
space:
mode:
authorshpuld <shp@cock.li>2017-11-13 16:33:54 +0200
committershpuld <shp@cock.li>2017-11-13 16:33:54 +0200
commitab1d1b3dd0f2ea1c44f4ae7a5f08c52d7ea8520c (patch)
tree12a9b3e69d853c4b975da94effe32d64adff51f1 /src/components/conversation/conversation.js
parentd7e4279c590a002411abb31f2f164301fdb34493 (diff)
Move previews from conversation to status, put the reply preview arrow back on timeline statuses, add a spinner when the preview is still loading.
Diffstat (limited to 'src/components/conversation/conversation.js')
-rw-r--r--src/components/conversation/conversation.js18
1 files changed, 2 insertions, 16 deletions
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 89fcfddb..9d9f7bbe 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -1,4 +1,4 @@
-import { reduce, find, filter, sortBy } from 'lodash'
+import { reduce, filter, sortBy } from 'lodash'
import { statusType } from '../../modules/statuses.js'
import Status from '../status/status.vue'
@@ -10,12 +10,7 @@ const sortAndFilterConversation = (conversation) => {
const conversation = {
data () {
return {
- highlight: null,
- preview: {
- x: 0,
- y: 0,
- status: null
- }
+ highlight: null
}
},
props: [
@@ -86,15 +81,6 @@ const conversation = {
},
setHighlight (id) {
this.highlight = Number(id)
- },
- setPreview (id, x, y) {
- if (id) {
- this.preview.x = x
- this.preview.y = y
- this.preview.status = find(this.conversation, { id: id })
- } else {
- this.preview.status = null
- }
}
}
}