fix IE bug by removing multiple define of chartoptions.animation in p…

…ie chart and doughnut chart
mendixlabs · Nov 20, 2017 · c15c379 · c15c379
1 parent 8d33efb
commit c15c379
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/src/ChartJS/widgets/DoughnutChart/widget/DoughnutChart.js b/src/ChartJS/widgets/DoughnutChart/widget/DoughnutChart.js
@@ -90,17 +90,15 @@ define([
                         animateScale: this.animateScale,
                         duration: this.animationDuration,
                         //String - Animation easing effect
-                        easing: this.animationEasing
+                        easing: this.animationEasing,
+                        onComplete: lang.hitch(this, this._animationComplete)
                     },
 
                     legendCallback: this._legendAlternateCallback,
 
                     //Number - The percentage of the chart that we cut out of the middle
                     cutoutPercentage: this.percentageInnerCutout,
 
-                    animation: {
-                        onComplete: lang.hitch(this, this._animationComplete)
-                    }
                 })
             });
 
@@ -121,4 +119,4 @@ define([
     });
 });
 
-require(["ChartJS/widgets/DoughnutChart/widget/DoughnutChart"]);
+require(["ChartJS/widgets/DoughnutChart/widget/DoughnutChart"]);
diff --git a/src/ChartJS/widgets/PieChart/widget/PieChart.js b/src/ChartJS/widgets/PieChart/widget/PieChart.js
@@ -94,17 +94,15 @@ define([
                             animateScale: this.animateScale,
                             duration: this.animationDuration,
                             //String - Animation easing effect
-                            easing: this.animationEasing
+                            easing: this.animationEasing,
+                            onComplete: lang.hitch(this, this._animationComplete)
                         },
 
                         legendCallback: this._legendAlternateCallback,
 
                         //cutOut of pie
                         cutoutPercentage: 0, //always zero for Pie chart
 
-                        animation: {
-                            onComplete: lang.hitch(this, this._animationComplete)
-                        }
                     })
                 };
                 this._chart = new this._chartJS(this._ctx, chartProperties);
@@ -123,4 +121,4 @@ define([
     });
 });
 
-require(["ChartJS/widgets/PieChart/widget/PieChart"]);
+require(["ChartJS/widgets/PieChart/widget/PieChart"]);
diff --git a/test/widgets/ChartJS.mpk b/test/widgets/ChartJS.mpk