Commit ed8f8888 authored by Masayuki Tanaka's avatar Masayuki Tanaka

Hide tooltip when hidden on custom xs - #154

parent a009c7d7
...@@ -2894,18 +2894,21 @@ ...@@ -2894,18 +2894,21 @@
unexpandCircles(); unexpandCircles();
}) })
.on('mousemove', function () { .on('mousemove', function () {
var targetsToShow = filterTargetsToShow(c3.data.targets);
var mouse, closest, sameXData, selectedData; var mouse, closest, sameXData, selectedData;
if (dragging) { return; } // do nothing when dragging if (dragging) { return; } // do nothing when dragging
if (hasArcType(c3.data.targets)) { return; } if (hasArcType(targetsToShow)) { return; }
mouse = d3.mouse(this); mouse = d3.mouse(this);
closest = findClosestFromTargets(c3.data.targets, mouse); closest = findClosestFromTargets(targetsToShow, mouse);
if (! closest) { return; }
if (isScatterType(closest)) { if (isScatterType(closest)) {
sameXData = [closest]; sameXData = [closest];
} else { } else {
sameXData = filterSameX(c3.data.targets, closest.x); sameXData = filterSameX(targetsToShow, closest.x);
} }
// show tooltip when cursor is close to some point // show tooltip when cursor is close to some point
...@@ -2937,12 +2940,15 @@ ...@@ -2937,12 +2940,15 @@
} }
}) })
.on('click', function () { .on('click', function () {
var targetsToShow = filterTargetsToShow(c3.data.targets);
var mouse, closest; var mouse, closest;
if (hasArcType(c3.data.targets)) { return; } if (hasArcType(targetsToShow)) { return; }
mouse = d3.mouse(this); mouse = d3.mouse(this);
closest = findClosestFromTargets(c3.data.targets, mouse); closest = findClosestFromTargets(targetsToShow, mouse);
if (! closest) { return; }
// select if selection enabled // select if selection enabled
if (dist(closest, mouse) < 100) { if (dist(closest, mouse) < 100) {
......
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