Add data.selection.draggable and enable scrolling even if it's on the chart - #215 #798

cc571011 · Masayuki Tanaka · 795219f7 · cc571011 · cc571011 · cc571011
Commit cc571011 authored Jan 17, 2015 by Masayuki Tanaka
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 8 deletions

c3.js c3.js +7 -4

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

config.js src/config.js +1 -0

interaction.js src/interaction.js +6 -4

No files found.
--- a/c3.js
+++ b/c3.js
@@ -972,6 +972,7 @@
            data_selection_grouped: false,
            data_selection_isselectable: function () { return true; },
            data_selection_multiple: true,
+            data_selection_draggable: false,
            data_onclick: function () {},
            data_onmouseover: function () {},
            data_onmouseout: function () {},
@@ -2366,10 +2367,12 @@
                });
            })
            .call(
-                d3.behavior.drag().origin(Object)
-                    .on('drag', function () { $$.drag(d3.mouse(this)); })
-                    .on('dragstart', function () { $$.dragstart(d3.mouse(this)); })
-                    .on('dragend', function () { $$.dragend(); })
+                config.data_selection_draggable && $$.drag ? (
+                    d3.behavior.drag().origin(Object)
+                        .on('drag', function () { $$.drag(d3.mouse(this)); })
+                        .on('dragstart', function () { $$.dragstart(d3.mouse(this)); })
+                        .on('dragend', function () { $$.dragend(); })
+                ) : function () {}
            );
    };


--- a/c3.min.js
+++ b/c3.min.js
--- a/src/config.js
+++ b/src/config.js
@@ -44,6 +44,7 @@ c3_chart_internal_fn.getDefaultConfig = function () {
        data_selection_grouped: false,
        data_selection_isselectable: function () { return true; },
        data_selection_multiple: true,
+        data_selection_draggable: false,
        data_onclick: function () {},
        data_onmouseover: function () {},
        data_onmouseout: function () {},

--- a/src/interaction.js
+++ b/src/interaction.js
@@ -231,10 +231,12 @@ c3_chart_internal_fn.generateEventRectsForSingleX = function (eventRectEnter) {
            });
        })
        .call(
-            d3.behavior.drag().origin(Object)
-                .on('drag', function () { $$.drag(d3.mouse(this)); })
-                .on('dragstart', function () { $$.dragstart(d3.mouse(this)); })
-                .on('dragend', function () { $$.dragend(); })
+            config.data_selection_draggable && $$.drag ? (
+                d3.behavior.drag().origin(Object)
+                    .on('drag', function () { $$.drag(d3.mouse(this)); })
+                    .on('dragstart', function () { $$.dragstart(d3.mouse(this)); })
+                    .on('dragend', function () { $$.dragend(); })
+            ) : function () {}
        );
 };