Added back the transitionDuration property to nv.models.axis. Added transitionDuration to historicalBar.

master
Robin Hu 11 years ago
parent e2ef9489da
commit 58d60f9cb5

@ -33,7 +33,9 @@ nv.addGraph({
var chart = nv.models.historicalBarChart()
// .padData(true)
.width(width)
.height(height /2);
.height(height /2)
.transitionDuration(0)
;
chart.xAxis // chart sub-models (ie. xAxis, yAxis, etc) when accessed directly, return themselves, not the parent chart, so need to chain separately
.tickFormat(d3.format(',.1f'));

@ -3,7 +3,7 @@
var nv = window.nv || {};
nv.version = '1.1.8b';
nv.version = '1.1.9b';
nv.dev = true //set false when in production
window.nv = nv;
@ -973,7 +973,7 @@ nv.models.axis = function() {
//TODO: consider calculating width/height based on whether or not label is added, for reference in charts using this component
g.transition().call(axis);
g.transition().duration(transitionDuration).call(axis);
scale0 = scale0 || axis.scale();
@ -3664,6 +3664,7 @@ nv.models.historicalBar = function() {
, yRange
, dispatch = d3.dispatch('chartClick', 'elementClick', 'elementDblClick', 'elementMouseover', 'elementMouseout')
, interactive = true
, transitionDuration = 250
;
//============================================================
@ -3812,7 +3813,7 @@ nv.models.historicalBar = function() {
.attr('width', (availableWidth / data[0].values.length) * .9 )
bars.transition()
bars.transition().duration(transitionDuration)
.attr('y', function(d,i) {
var rval = getY(d,i) < 0 ?
y(0) :
@ -3959,6 +3960,12 @@ nv.models.historicalBar = function() {
return chart;
};
chart.transitionDuration = function(_) {
if (!arguments.length) return transitionDuration;
transitionDuration = _;
return chart;
};
//============================================================
@ -4381,6 +4388,14 @@ nv.models.historicalBarChart = function() {
return chart;
};
chart.transitionDuration = function(_) {
if (!arguments.length) return bars.transitionDuration();
bars.transitionDuration(_);
xAxis.transitionDuration(_);
yAxis.transitionDuration(_);
return chart;
};
//============================================================

12
nv.d3.min.js vendored

File diff suppressed because one or more lines are too long

@ -65,7 +65,7 @@ nv.models.axis = function() {
//TODO: consider calculating width/height based on whether or not label is added, for reference in charts using this component
g.transition().call(axis);
g.transition().duration(transitionDuration).call(axis);
scale0 = scale0 || axis.scale();

@ -24,6 +24,7 @@ nv.models.historicalBar = function() {
, yRange
, dispatch = d3.dispatch('chartClick', 'elementClick', 'elementDblClick', 'elementMouseover', 'elementMouseout')
, interactive = true
, transitionDuration = 250
;
//============================================================
@ -172,7 +173,7 @@ nv.models.historicalBar = function() {
.attr('width', (availableWidth / data[0].values.length) * .9 )
bars.transition()
bars.transition().duration(transitionDuration)
.attr('y', function(d,i) {
var rval = getY(d,i) < 0 ?
y(0) :
@ -319,6 +320,12 @@ nv.models.historicalBar = function() {
return chart;
};
chart.transitionDuration = function(_) {
if (!arguments.length) return transitionDuration;
transitionDuration = _;
return chart;
};
//============================================================

@ -415,6 +415,14 @@ nv.models.historicalBarChart = function() {
return chart;
};
chart.transitionDuration = function(_) {
if (!arguments.length) return bars.transitionDuration();
bars.transitionDuration(_);
xAxis.transitionDuration(_);
yAxis.transitionDuration(_);
return chart;
};
//============================================================

Loading…
Cancel
Save