Commit 21039143 authored by Masayuki Tanaka's avatar Masayuki Tanaka

Fix zoom and brush combination

parent af9cdf6a
...@@ -424,14 +424,9 @@ ...@@ -424,14 +424,9 @@
} }
function getXDomainRatio () { function getXDomainRatio () {
var domain, extent; var domain, extent;
if (__subchart_show) { if (brush.empty()) return 1;
if (brush.empty()) return 1; domain = orgXDomain;
domain = subX.domain(); extent = x.domain();
extent = brush.extent();
} else {
domain = orgXDomain;
extent = x.domain();
}
return (domain[1] - domain[0]) / (extent[1] - extent[0]); return (domain[1] - domain[0]) / (extent[1] - extent[0]);
} }
...@@ -1261,6 +1256,12 @@ ...@@ -1261,6 +1256,12 @@
subY.domain(y.domain()); subY.domain(y.domain());
subY2.domain(y2.domain()); subY2.domain(y2.domain());
// Update brush extent if zoom
if (d3.event !== null && d3.event.type === 'zoom') {
brush.extent(x.domain());
if ( ! brush.empty()) context.select('.x.brush').call(brush);
}
// grid // grid
if (__grid_x_show) { if (__grid_x_show) {
if (__grid_x_type === 'year') { if (__grid_x_type === 'year') {
......
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