|
|
|
@ -108,14 +108,14 @@ nv.models.linePlusBarChart = function() {
|
|
|
|
|
//------------------------------------------------------------
|
|
|
|
|
// Setup Scales
|
|
|
|
|
|
|
|
|
|
var dataBars = data.filter(function(d) { return !d.disabled && d.bar });
|
|
|
|
|
var dataLines = data.filter(function(d) { return !d.bar }); // removed the !d.disabled clause here to fix Issue #240
|
|
|
|
|
|
|
|
|
|
//x = xAxis.scale();
|
|
|
|
|
x = lines.xScale();
|
|
|
|
|
x = dataLines.filter(function(d) { return !d.disabled; }).length ? lines.xScale() : bars.xScale();
|
|
|
|
|
y1 = bars.yScale();
|
|
|
|
|
y2 = lines.yScale();
|
|
|
|
|
|
|
|
|
|
var dataBars = data.filter(function(d) { return !d.disabled && d.bar });
|
|
|
|
|
var dataLines = data.filter(function(d) { return !d.bar }); // removed the !d.disabled clause here to fix Issue #240
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|