Skip to content

Commit c15c379

Browse files
committed
fix IE bug by removing multiple define of chartoptions.animation in pie chart and doughnut chart
1 parent 8d33efb commit c15c379

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

src/ChartJS/widgets/DoughnutChart/widget/DoughnutChart.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,17 +90,15 @@ define([
9090
animateScale: this.animateScale,
9191
duration: this.animationDuration,
9292
//String - Animation easing effect
93-
easing: this.animationEasing
93+
easing: this.animationEasing,
94+
onComplete: lang.hitch(this, this._animationComplete)
9495
},
9596

9697
legendCallback: this._legendAlternateCallback,
9798

9899
//Number - The percentage of the chart that we cut out of the middle
99100
cutoutPercentage: this.percentageInnerCutout,
100101

101-
animation: {
102-
onComplete: lang.hitch(this, this._animationComplete)
103-
}
104102
})
105103
});
106104

@@ -121,4 +119,4 @@ define([
121119
});
122120
});
123121

124-
require(["ChartJS/widgets/DoughnutChart/widget/DoughnutChart"]);
122+
require(["ChartJS/widgets/DoughnutChart/widget/DoughnutChart"]);

src/ChartJS/widgets/PieChart/widget/PieChart.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,15 @@ define([
9494
animateScale: this.animateScale,
9595
duration: this.animationDuration,
9696
//String - Animation easing effect
97-
easing: this.animationEasing
97+
easing: this.animationEasing,
98+
onComplete: lang.hitch(this, this._animationComplete)
9899
},
99100

100101
legendCallback: this._legendAlternateCallback,
101102

102103
//cutOut of pie
103104
cutoutPercentage: 0, //always zero for Pie chart
104105

105-
animation: {
106-
onComplete: lang.hitch(this, this._animationComplete)
107-
}
108106
})
109107
};
110108
this._chart = new this._chartJS(this._ctx, chartProperties);
@@ -123,4 +121,4 @@ define([
123121
});
124122
});
125123

126-
require(["ChartJS/widgets/PieChart/widget/PieChart"]);
124+
require(["ChartJS/widgets/PieChart/widget/PieChart"]);

test/widgets/ChartJS.mpk

-1 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)