moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/hotfix-for-reply-navigation' into 'develop' 

Unbreak reply navigation

See merge request pleroma/pleroma-fe!159
This commit is contained in:
Shpuld Shpludson 2017-11-14 07:01:22 +00:00
parent 55c4818084 dc4755f2ff
commit f9c701a702
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/status/status.js
View File

@ -92,7 +92,7 @@ const Status = {
}, },
gotoOriginal (id) { gotoOriginal (id) {
// only handled by conversation, not status_or_conversation // only handled by conversation, not status_or_conversation
if (this.expanded) { if (this.inConversation) {
this.$emit('goto', id) this.$emit('goto', id)
} }
}, },
@ -122,18 +122,9 @@ const Status = {
} else if (this.preview.id !== targetId) { } else if (this.preview.id !== targetId) {
this.preview = find(statuses, { 'id': targetId }) this.preview = find(statuses, { 'id': targetId })
} }
/*
if (this.$store.state.config.hoverPreview) {
let rect = event.target.getBoundingClientRect()
this.$emit('preview', Number(id), rect.left + 20, rect.top + 20 + window.pageYOffset)
}
*/
}, },
replyLeave () { replyLeave () {
this.showPreview = false this.showPreview = false
/*
this.$emit('preview', 0, 0, 0)
*/
} }
}, },
watch: { watch: {