Move previews from conversation to status, put the reply preview arrow back on timeline statuses, add a spinner when the preview is still loading.
This commit is contained in:
parent
d7e4279c59
commit
ab1d1b3dd0
4 changed files with 84 additions and 60 deletions
|
@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue