]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Merge branch 'v2.0-dev' into v2.0-legend 1750/head
authorEvert Timberg <evert.timberg@gmail.com>
Tue, 8 Dec 2015 03:10:38 +0000 (22:10 -0500)
committerEvert Timberg <evert.timberg@gmail.com>
Tue, 8 Dec 2015 03:10:38 +0000 (22:10 -0500)
Conflicts:
src/controllers/controller.doughnut.js

1  2 
docs/00-Getting-Started.md
src/controllers/controller.doughnut.js
src/core/core.controller.js
src/core/core.scale.js
src/elements/element.line.js
test/controller.doughnut.tests.js

Simple merge
index fddc97da1caef8be39543a40f57c09242ff85927,9a7cea9af735f0c347d1561b445e903a681804ee..2c37b9b90db0e44e3b6c784ca92b30349ee4f987
                        }, this);
                },
                updateElement: function(arc, index, reset) {
 +                      var centerX = (this.chart.chartArea.left + this.chart.chartArea.right) / 2;
 +                      var centerY = (this.chart.chartArea.top + this.chart.chartArea.bottom) / 2;
 +
                        var resetModel = {
 -                              x: this.chart.chart.width / 2,
 -                              y: this.chart.chart.height / 2,
 -                              startAngle: Math.PI * -0.5, // use - PI / 2 instead of 3PI / 2 to make animations better. It means that we never deal with overflow during the transition function,
 +                              x: centerX,
 +                              y: centerY,
 +                              startAngle: Math.PI * -0.5, // use - PI / 2 instead of 3PI / 2 to make animations better. It means that we never deal with overflow during the transition function
+                               endAngle: Math.PI * -0.5,
                                circumference: (this.chart.options.animation.animateRotate) ? 0 : this.calculateCircumference(this.getDataset().data[index]),
                                outerRadius: (this.chart.options.animation.animateScale) ? 0 : this.outerRadius,
-                               innerRadius: (this.chart.options.animation.animateScale) ? 0 : this.innerRadius,
+                               innerRadius: (this.chart.options.animation.animateScale) ? 0 : this.innerRadius
                        };
  
                        helpers.extend(arc, {
Simple merge
Simple merge
Simple merge
Simple merge