Merge branch 'master' of https://github.com/novus/nvd3 into development

Conflicts:
	nv.d3.min.js
master
Tyler Wolf 11 years ago
commit af8b13dd48

@ -9515,8 +9515,8 @@ nv.models.scatter = function() {
// *Injecting series and point index for reference
/* *Adding a 'jitter' to the points, because there's an issue in d3.geom.voronoi.
*/
var pX = getX(point,pointIndex) + Math.random() * 1e-10;
var pY = getY(point,pointIndex) + Math.random() * 1e-10;
var pX = getX(point,pointIndex) + Math.random() * 1e-7;
var pY = getY(point,pointIndex) + Math.random() * 1e-7;
return [x(pX),
y(pY),

2
nv.d3.min.js vendored

File diff suppressed because one or more lines are too long

@ -163,8 +163,8 @@ nv.models.scatter = function() {
// *Injecting series and point index for reference
/* *Adding a 'jitter' to the points, because there's an issue in d3.geom.voronoi.
*/
var pX = getX(point,pointIndex) + Math.random() * 1e-10;
var pY = getY(point,pointIndex) + Math.random() * 1e-10;
var pX = getX(point,pointIndex) + Math.random() * 1e-7;
var pY = getY(point,pointIndex) + Math.random() * 1e-7;
return [x(pX),
y(pY),

Loading…
Cancel
Save