diff options
| author | Shpuld Shpludson <shp@cock.li> | 2017-11-14 07:01:22 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2017-11-14 07:01:22 +0000 |
| commit | f9c701a7025f5717937a0e55d7e64d2db5ea80b6 (patch) | |
| tree | 432ea1c74bfef0e8efc9864b3d40977c23ff00bf | |
| parent | 55c481808477fdbc4c56edf22e27336b5e27d3fb (diff) | |
| parent | dc4755f2ff0ae031ee88b2e8a697c04c3ad561c8 (diff) | |
Merge branch 'fix/hotfix-for-reply-navigation' into 'develop'
Unbreak reply navigation
See merge request pleroma/pleroma-fe!159
| -rw-r--r-- | src/components/status/status.js | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/components/status/status.js b/src/components/status/status.js index 55976b8b..12f3bb25 100644 --- 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: { |