]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Use new animation options in the animation service.
authorEvert Timberg <evert.timberg@gmail.com>
Tue, 26 May 2015 22:54:36 +0000 (18:54 -0400)
committerEvert Timberg <evert.timberg@gmail.com>
Tue, 26 May 2015 22:54:36 +0000 (18:54 -0400)
src/Chart.Core.js

index 1be01b57a94a1ea40fba493d79d8744ddea2b435..7fc57ac932493f4c4ef315e0b56d81e1aaf63880 100755 (executable)
         redraw: noop,
         render: function(duration) {
 
-            if (this.options.animation) {
+            if (this.options.animation.duration !== 0) {
                 var animation = new Chart.Animation();
-                animation.numSteps = (duration || this.options.animationDuration) / 16.66; //60 fps
-                animation.easing = this.options.animationEasing;
+                animation.numSteps = (duration || this.options.animation.duration) / 16.66; //60 fps
+                animation.easing = this.options.animation.easing;
 
                 // render function
                 animation.render = function(chartInstance, animationObject) {