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

Conflicts:
	nv.d3.min.js
master
Tyler Wolf 12 years ago
commit 1ac80d87c8

@ -9485,7 +9485,15 @@ nv.models.scatter = function() {
.map(function(point, pointIndex) {
// *Adding noise to make duplicates very unlikely
// **Injecting series and point index for reference
return [x(getX(point,pointIndex)) * (Math.random() / 1e12 + 1) , y(getY(point,pointIndex)) * (Math.random() / 1e12 + 1), groupIndex, pointIndex, point]; //temp hack to add noise untill I think of a better way so there are no duplicates
/*[SUPPORT-706] 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;
return [x(pX),
y(pY),
groupIndex,
pointIndex, point]; //temp hack to add noise untill I think of a better way so there are no duplicates
})
.filter(function(pointArray, pointIndex) {
return pointActive(pointArray[4], pointIndex); // Issue #237.. move filter to after map, so pointIndex is correct!

4
nv.d3.min.js vendored

File diff suppressed because one or more lines are too long

@ -161,7 +161,15 @@ nv.models.scatter = function() {
.map(function(point, pointIndex) {
// *Adding noise to make duplicates very unlikely
// **Injecting series and point index for reference
return [x(getX(point,pointIndex)) * (Math.random() / 1e12 + 1) , y(getY(point,pointIndex)) * (Math.random() / 1e12 + 1), groupIndex, pointIndex, point]; //temp hack to add noise untill I think of a better way so there are no duplicates
/*[SUPPORT-706] 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;
return [x(pX),
y(pY),
groupIndex,
pointIndex, point]; //temp hack to add noise untill I think of a better way so there are no duplicates
})
.filter(function(pointArray, pointIndex) {
return pointActive(pointArray[4], pointIndex); // Issue #237.. move filter to after map, so pointIndex is correct!

Loading…
Cancel
Save