Commit 6a46a8f1 authored by Phil Hughes's avatar Phil Hughes

Merge branch '18573-tooltip-remain-displayed-in-the-graph-view' into 'master'

Fix commit graph toolips being left visible when scrolling on Firefox

See merge request gitlab-org/gitlab!56631
parents def5fbac 089916ca
...@@ -234,8 +234,7 @@ export default class BranchGraph { ...@@ -234,8 +234,7 @@ export default class BranchGraph {
appendAnchor(x, y, commit) { appendAnchor(x, y, commit) {
const { r, top, options } = this; const { r, top, options } = this;
const anchor = r r.circle(x, y, 10)
.circle(x, y, 10)
.attr({ .attr({
fill: '#000', fill: '#000',
opacity: 0, opacity: 0,
...@@ -245,13 +244,14 @@ export default class BranchGraph { ...@@ -245,13 +244,14 @@ export default class BranchGraph {
.hover( .hover(
function () { function () {
this.tooltip = r.commitTooltip(x + 5, y, commit); this.tooltip = r.commitTooltip(x + 5, y, commit);
return top.push(this.tooltip.insertBefore(this)); top.push(this.tooltip.insertBefore(this));
return this.tooltip.toFront();
}, },
function () { function () {
top.remove(this.tooltip);
return this.tooltip && this.tooltip.remove() && delete this.tooltip; return this.tooltip && this.tooltip.remove() && delete this.tooltip;
}, },
); );
return top.push(anchor);
} }
drawDot(x, y, commit) { drawDot(x, y, commit) {
......
---
title: Fix tooltips failing to hide in commit graph on Firefox
merge_request: 56631
author: Jonathan Duncan
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment