]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Integrate animation service with chart
authorEvert Timberg <evert.timberg@gmail.com>
Sat, 11 Apr 2015 23:33:20 +0000 (19:33 -0400)
committerEvert Timberg <evert.timberg@gmail.com>
Sat, 11 Apr 2015 23:33:20 +0000 (19:33 -0400)
src/Chart.Core.js

index 36f58723c733b6ebfc5963464dc1a2959de327cd..2a7908c6b8212e54c960f7984c0888fb23d87eb1 100755 (executable)
 
        Chart.animationService = {
                animations: [],
-               addAnimation: function(chart, animationObject) {
+               addAnimation: function(chartInstance, animationObject) {
                        for (var index = 0; index < this.animations.length; ++ index){
-                               if (this.animations[index].chart === chart){
+                               if (this.animations[index].chartInstance === chartInstance){
                                        // replacing an in progress animation
                                        this.animations[index].lastTimeRun = null;
                                        this.animations[index].animationObject = animationObject;
                        }
                        
                        this.animations.push({
-                               chart: chart,
+                               chartInstance: chartInstance,
                                animationObject: animationObject,
                                lastTimeRun: null
                        });
                                        currentAnimation.animationObject.currentStep++;
                                }
                                
-                               currentAnimation.animationObject.render(currentAnimation.animationObject);
+                               currentAnimation.animationObject.render(currentAnimation.chartInstance, currentAnimation.animationObject);
                                
                                if (currentAnimation.animationObject.currentStep == currentAnimation.animationObject.numSteps){
                                        // executed the last frame. Remove the animation.