Commit edc15c94 authored by Masayuki Tanaka's avatar Masayuki Tanaka

Enable multiple selection with alt drag

parent 6fb6b0f1
...@@ -793,7 +793,7 @@ ...@@ -793,7 +793,7 @@
//-- Define brush/zoom -// //-- Define brush/zoom -//
var brush = d3.svg.brush().on("brush", redrawForBrush); var brush = d3.svg.brush().on("brush", redrawForBrush);
var zoom = d3.behavior.zoom().on("zoom", __zoom_enabled ? redrawForZoom : null); var zoom = d3.behavior.zoom().on("zoomstart", function(){ zoom.startDomain = d3.event.sourceEvent.altKey ? x.orgDomain() : null; }).on("zoom", __zoom_enabled ? redrawForZoom : null);
// define functions for c3 // define functions for c3
brush.update = function () { brush.update = function () {
...@@ -1104,7 +1104,7 @@ ...@@ -1104,7 +1104,7 @@
.call( .call(
d3.behavior.drag().origin(Object).on('drag', function(d){ d3.behavior.drag().origin(Object).on('drag', function(d){
if ( ! __data_selection_enabled) return; // do nothing if not selectable if ( ! __data_selection_enabled) return; // do nothing if not selectable
if (__zoom_enabled) return; // skip if zoomable because of conflict drag dehavior if (__zoom_enabled && ! zoom.startDomain) return; // skip if zoomable because of conflict drag dehavior
var sx = dragStart[0], sy = dragStart[1], var sx = dragStart[0], sy = dragStart[1],
mouse = d3.mouse(this), mouse = d3.mouse(this),
...@@ -1461,6 +1461,11 @@ ...@@ -1461,6 +1461,11 @@
}); });
} }
function redrawForZoom() { function redrawForZoom() {
if (d3.event.sourceEvent.type === 'mousemove' && zoom.startDomain) {
x.domain(zoom.startDomain);
zoom.x(x);
return;
}
redraw({ redraw({
withTransition: false, withTransition: false,
withY: false, withY: false,
......
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