archive-gh-me/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2025-12-08 20:36:08 +00:00
Code Issues Projects Releases Wiki Activity

chart.update(animationDuration) support

Browse Source
This commit is contained in:
Tanner Linsley 2015-06-08 15:57:47 -06:00
parent 24d32e9321
commit 8f5d702a86
8 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Chart.js vendored
View File

@ -989,7 +989,7 @@
redraw: noop,
render: function(duration) {
if (this.options.animation.duration !== 0) {
if (this.options.animation.duration !== 0 || duration) {
var animation = new Chart.Animation();
animation.numSteps = (duration || this.options.animation.duration) / 16.66; //60 fps
animation.easing = this.options.animation.easing;
@ -2123,7 +2123,7 @@
var yScalePoint;
if (yScale.min < 0 && yScale.max <0) {
if (yScale.min < 0 && yScale.max < 0) {
// all less than 0. use the top
yScalePoint = yScale.getPixelForValue(yScale.max);
} else if (yScale.min > 0 && yScale.max > 0) {
@ -2160,7 +2160,7 @@
bar.pivot();
}, this);
},
update: function() {
update: function(animationDuration) {
// Update the scale sizes
Chart.scaleService.fitScalesForChart(this, this.chart.width, this.chart.height);
@ -2198,7 +2198,7 @@
}, this);
this.render();
this.render(animationDuration);
},
buildScale: function(labels) {
var self = this;
@ -2663,7 +2663,7 @@
}, this);
},
update: function() {
update: function(animationDuration) {
this.outerRadius = (helpers.min([this.chart.width, this.chart.height]) - this.options.elements.slice.borderWidth / 2) / 2;
this.innerRadius = this.options.cutoutPercentage ? (this.outerRadius / 100) * (this.options.cutoutPercentage) : 1;
@ -2727,7 +2727,7 @@
}, this);
this.render();
this.render(animationDuration);
},
draw: function(easeDecimal) {
easeDecimal = easeDecimal || 1;
@ -3072,7 +3072,7 @@
var yScalePoint;
if (yScale.min < 0 && yScale.max <0) {
if (yScale.min < 0 && yScale.max < 0) {
// all less than 0. use the top
yScalePoint = yScale.getPixelForValue(yScale.max);
} else if (yScale.min > 0 && yScale.max > 0) {
@ -3144,7 +3144,7 @@
point.pivot();
}, this);
},
update: function() {
update: function(animationDuration) {
Chart.scaleService.fitScalesForChart(this, this.chart.width, this.chart.height);
@ -3247,7 +3247,7 @@
point.pivot();
}, this);
this.render();
this.render(animationDuration);
},
buildScale: function() {
var self = this;
@ -3710,7 +3710,7 @@
slice.pivot();
}, this);
},
update: function() {
update: function(animationDuration) {
this.updateScaleRange();
this.scale.calculateRange();
@ -3753,7 +3753,7 @@
}, this);
this.render();
this.render(animationDuration);
},
draw: function(ease) {
var easingDecimal = ease || 1;
@ -4128,7 +4128,7 @@
point.pivot();
}, this);
},
update: function() {
update: function(animationDuration) {
Chart.scaleService.fitScalesForChart(this, this.chart.width, this.chart.height);
// Update the lines
@ -4227,7 +4227,7 @@
point.pivot();
}, this);
this.render();
this.render(animationDuration);
},
buildScale: function() {
var self = this;

6
Chart.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
src/Chart.Bar.js
View File

@ -134,7 +134,7 @@
var yScalePoint;
if (yScale.min < 0 && yScale.max <0) {
if (yScale.min < 0 && yScale.max < 0) {
// all less than 0. use the top
yScalePoint = yScale.getPixelForValue(yScale.max);
} else if (yScale.min > 0 && yScale.max > 0) {
@ -171,7 +171,7 @@
bar.pivot();
}, this);
},
update: function() {
update: function(animationDuration) {
// Update the scale sizes
Chart.scaleService.fitScalesForChart(this, this.chart.width, this.chart.height);
@ -209,7 +209,7 @@
}, this);
this.render();
this.render(animationDuration);
},
buildScale: function(labels) {
var self = this;

2
src/Chart.Core.js
View File

@ -989,7 +989,7 @@
redraw: noop,
render: function(duration) {
if (this.options.animation.duration !== 0) {
if (this.options.animation.duration !== 0 || duration) {
var animation = new Chart.Animation();
animation.numSteps = (duration || this.options.animation.duration) / 16.66; //60 fps
animation.easing = this.options.animation.easing;

4
src/Chart.Doughnut.js
View File

@ -112,7 +112,7 @@
}, this);
},
update: function() {
update: function(animationDuration) {
this.outerRadius = (helpers.min([this.chart.width, this.chart.height]) - this.options.elements.slice.borderWidth / 2) / 2;
this.innerRadius = this.options.cutoutPercentage ? (this.outerRadius / 100) * (this.options.cutoutPercentage) : 1;
@ -176,7 +176,7 @@
}, this);
this.render();
this.render(animationDuration);
},
draw: function(easeDecimal) {
easeDecimal = easeDecimal || 1;

6
src/Chart.Line.js
View File

@ -153,7 +153,7 @@
var yScalePoint;
if (yScale.min < 0 && yScale.max <0) {
if (yScale.min < 0 && yScale.max < 0) {
// all less than 0. use the top
yScalePoint = yScale.getPixelForValue(yScale.max);
} else if (yScale.min > 0 && yScale.max > 0) {
@ -225,7 +225,7 @@
point.pivot();
}, this);
},
update: function() {
update: function(animationDuration) {
Chart.scaleService.fitScalesForChart(this, this.chart.width, this.chart.height);
@ -328,7 +328,7 @@
point.pivot();
}, this);
this.render();
this.render(animationDuration);
},
buildScale: function() {
var self = this;

4
src/Chart.PolarArea.js
View File

@ -170,7 +170,7 @@
slice.pivot();
}, this);
},
update: function() {
update: function(animationDuration) {
this.updateScaleRange();
this.scale.calculateRange();
@ -213,7 +213,7 @@
}, this);
this.render();
this.render(animationDuration);
},
draw: function(ease) {
var easingDecimal = ease || 1;

4
src/Chart.Radar.js
View File

@ -187,7 +187,7 @@
point.pivot();
}, this);
},
update: function() {
update: function(animationDuration) {
Chart.scaleService.fitScalesForChart(this, this.chart.width, this.chart.height);
// Update the lines
@ -286,7 +286,7 @@
point.pivot();
}, this);
this.render();
this.render(animationDuration);
},
buildScale: function() {
var self = this;