From: Evert Timberg <evert.timberg@gmail.com>
Date: Tue, 26 May 2015 22:54:36 +0000 (-0400)
Subject: Use new animation options in the animation service.
X-Git-Tag: v2.0-alpha~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e774a893da4f7be405af2926ae74499f2ab0d813;p=thirdparty%2FChart.js.git

Use new animation options in the animation service.
---

diff --git a/src/Chart.Core.js b/src/Chart.Core.js
index 1be01b57a..7fc57ac93 100755
--- a/src/Chart.Core.js
+++ b/src/Chart.Core.js
@@ -999,10 +999,10 @@
         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) {