logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: f9c701a7025f5717937a0e55d7e64d2db5ea80b6
parent: 55c481808477fdbc4c56edf22e27336b5e27d3fb
Author: Shpuld Shpludson <shp@cock.li>
Date:   Tue, 14 Nov 2017 07:01:22 +0000

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

Unbreak reply navigation

See merge request pleroma/pleroma-fe!159

Diffstat:

Msrc/components/status/status.js11+----------
1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/components/status/status.js b/src/components/status/status.js @@ -92,7 +92,7 @@ const Status = { }, gotoOriginal (id) { // only handled by conversation, not status_or_conversation - if (this.expanded) { + if (this.inConversation) { this.$emit('goto', id) } }, @@ -122,18 +122,9 @@ const Status = { } else if (this.preview.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 () { this.showPreview = false - /* - this.$emit('preview', 0, 0, 0) - */ } }, watch: {