Merge branch 'derek-schultz-ungroup-multiple-x'

b17c3ab2 · Masayuki Tanaka · 6433f4a1 · def0b027 · b17c3ab2 · b17c3ab2
Commit b17c3ab2 authored Nov 03, 2014 by Masayuki Tanaka
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

c3.js c3.js +1 -1

c3.min.js c3.min.js +0 -0

interaction.js src/interaction.js +1 -1

No files found.
--- a/c3.js
+++ b/c3.js
@@ -2313,7 +2313,7 @@

                if (! closest) { return; }

-                if ($$.isScatterType(closest)) {
+                if ($$.isScatterType(closest) || !config.tooltip_grouped) {
                    sameXData = [closest];
                } else {
                    sameXData = $$.filterByX(targetsToShow, closest.x);

--- a/c3.min.js
+++ b/c3.min.js
--- a/src/interaction.js
+++ b/src/interaction.js
@@ -261,7 +261,7 @@ c3_chart_internal_fn.generateEventRectsForMultipleXs = function (eventRectEnter)

            if (! closest) { return; }

-            if ($$.isScatterType(closest)) {
+            if ($$.isScatterType(closest) || !config.tooltip_grouped) {
                sameXData = [closest];
            } else {
                sameXData = $$.filterByX(targetsToShow, closest.x);