Skip to content

Commit

Permalink
Merge pull request #111 from 10gen/INT-456-QB-backwards-pass
Browse files Browse the repository at this point in the history
better mousedown handling on existing selection
  • Loading branch information
imlucas committed Aug 25, 2015
2 parents 822638d + 65b4c9d commit 60a545e
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
6 changes: 5 additions & 1 deletion src/minicharts/d3fns/date.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,16 @@ var minicharts_d3fns_date = function() {
};
options.view.trigger('querybuilder', evt);
};

function handleMouseDown() {
var line = this;
var parent = $(this).closest('.minichart');
var background = parent.find('g.brush > rect.background')[0];
var brushNode = parent.find('g.brush')[0];
var start = barcodeX.invert(d3.mouse(background)[0]);
brushstart.call(brushNode, line);
var brushstartOnce = _.once(function() {
brushstart.call(brushNode, line);
});

var w = d3.select(window)
.on('mousemove', mousemove)
Expand All @@ -128,6 +131,7 @@ var minicharts_d3fns_date = function() {
d3.event.preventDefault(); // disable text dragging

function mousemove() {
brushstartOnce();
var extent = [start, barcodeX.invert(d3.mouse(background)[0])];
d3.select(brushNode).call(brush.extent(_.sortBy(extent)));
brushed.call(brushNode);
Expand Down
5 changes: 4 additions & 1 deletion src/minicharts/d3fns/few.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,9 @@ var minicharts_d3fns_few = function() {
var background = parent.find('g.brush > rect.background')[0];
var brushNode = parent.find('g.brush')[0];
var start = xScale.invert(d3.mouse(background)[0]);
brushstart.call(brushNode, rect);
var brushstartOnce = _.once(function() {
brushstart.call(brushNode, rect);
});

var w = d3.select(window)
.on('mousemove', mousemove)
Expand All @@ -115,6 +117,7 @@ var minicharts_d3fns_few = function() {
d3.event.preventDefault(); // disable text dragging

function mousemove() {
brushstartOnce();
var extent = [start, xScale.invert(d3.mouse(background)[0])];
d3.select(brushNode).call(brush.extent(_.sortBy(extent)));
brushed.call(brushNode);
Expand Down
5 changes: 4 additions & 1 deletion src/minicharts/d3fns/many.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,9 @@ var minicharts_d3fns_many = function() {
var background = parent.find('g.brush > rect.background')[0];
var brushNode = parent.find('g.brush')[0];
var start = d3.mouse(background)[0];
brushstart.call(brushNode, bar);
var brushstartOnce = _.once(function() {
brushstart.call(brushNode, bar);
});

var w = d3.select(window)
.on('mousemove', mousemove)
Expand All @@ -119,6 +121,7 @@ var minicharts_d3fns_many = function() {
d3.event.preventDefault(); // disable text dragging

function mousemove() {
brushstartOnce();
var extent = [start, d3.mouse(background)[0]];
d3.select(brushNode).call(brush.extent(_.sortBy(extent)));
brushed.call(brushNode);
Expand Down

0 comments on commit 60a545e

Please sign in to comment.