Merge branch 'development' into nvd3-UI-134

Conflicts:
	nv.d3.min.js
master
Robin Hu 11 years ago
commit 5e5ba5c34b

@ -2,7 +2,7 @@
var nv = window.nv || {};
nv.version = '0.0.1a';
nv.version = '1.0.0b';
nv.dev = true //set false when in production
window.nv = nv;
@ -2933,7 +2933,7 @@ nv.models.discreteBar = function() {
})
.select('rect')
.attr('height', function(d,i) {
return Math.max(Math.abs(y(getY(d,i)) - y(0)) || 1)
return Math.max(Math.abs(y(getY(d,i)) - y((yDomain && yDomain[0]) || 0)) || 1)
});
@ -3155,7 +3155,7 @@ nv.models.discreteBarChart = function() {
// Setup Scales
x = discretebar.xScale();
y = discretebar.yScale();
y = discretebar.yScale().clamp(true);
//------------------------------------------------------------

12
nv.d3.min.js vendored

File diff suppressed because one or more lines are too long

@ -1,7 +1,7 @@
var nv = window.nv || {};
nv.version = '0.0.1a';
nv.version = '1.0.0b';
nv.dev = true //set false when in production
window.nv = nv;

@ -208,7 +208,7 @@ nv.models.discreteBar = function() {
})
.select('rect')
.attr('height', function(d,i) {
return Math.max(Math.abs(y(getY(d,i)) - y(0)) || 1)
return Math.max(Math.abs(y(getY(d,i)) - y((yDomain && yDomain[0]) || 0)) || 1)
});

@ -103,7 +103,7 @@ nv.models.discreteBarChart = function() {
// Setup Scales
x = discretebar.xScale();
y = discretebar.yScale();
y = discretebar.yScale().clamp(true);
//------------------------------------------------------------

Loading…
Cancel
Save