Merge branch 'singleSelection' of https://github.com/hotzenklotz/c3 into…

Merge branch 'singleSelection' of https://github.com/hotzenklotz/c3 into hotzenklotz-singleSelection

Merge branch 'singleSelection' of https://github.com/hotzenklotz/c3 into…
fd96a8e1 · Masayuki Tanaka · 13927525 · cf4f5e95 · fd96a8e1 · fd96a8e1
Commit fd96a8e1 authored Mar 14, 2014 by Masayuki Tanaka
Hide whitespace changes
Inline Side-by-side

Showing with 34 additions and 1 deletion

c3.js c3.js +8 -1

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

selection_line.html htdocs/samples/selection_line.html +26 -0

No files found.
--- a/c3.js
+++ b/c3.js
@@ -65,7 +65,9 @@
            __data_colors = getConfig(['data', 'colors'], {}),
            __data_selection_enabled = getConfig(['data', 'selection', 'enabled'], false),
            __data_selection_grouped = getConfig(['data', 'selection', 'grouped'], false),
-            __data_selection_isselectable = getConfig(['data', 'selection', 'isselectable'], function () { return true; });
+            __data_selection_isselectable = getConfig(['data', 'selection', 'isselectable'], function () { return true; }),
+            __data_selection_multiselected = getConfig(['data', 'selection', 'multiselected'], true);
+

        // subchart
        var __subchart_show = getConfig(['subchart', 'show'], false),
@@ -2177,6 +2179,11 @@
            }
            if (__data_selection_grouped || isWithin) {
                if (__data_selection_enabled && __data_selection_isselectable(d)) {
+                    if (!__data_selection_multiselected) {
+                        main.selectAll(target.nodeName).each(function (d, i) {
+                            toggle(false, this, d, i);
+                        });
+                    }
                    _this.classed(SELECTED, !isSelected);
                    toggle(!isSelected, _this, d, i);
                }

--- a/c3.min.js
+++ b/c3.min.js
--- a/htdocs/samples/selection_line.html
+++ b/htdocs/samples/selection_line.html
+<html>
+  <head>
+    <link rel="stylesheet" type="text/css" href="/css/c3.css">
+  </head>
+  <body>
+    <div id="chart"></div>
+
+    <script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script>
+    <script src="/js/c3.js"></script>
+    <script>
+      var chart = c3.generate({
+        bindto: '#chart',
+        data: {
+          columns: [
+            ['sample', 30, 200, 100, 400, 150, 250]
+          ],
+          selection: {
+            enabled: true,
+            grouped: true,
+            multiselected: false
+          }
+        }
+      });
+    </script>
+  </body>
+</html>