From: Hiroshi Shirosaki Date: Tue, 21 Mar 2017 00:39:18 +0000 (+0900) Subject: Fix radar chart horizontal position (#4032) X-Git-Tag: v2.6.0~2^2~40 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cffa9447a189f58054243a8808ed9ebfdf56ee34;p=thirdparty%2FChart.js.git Fix radar chart horizontal position (#4032) Radar chart position is not center horizontally with v2.5.0. Right and left of `furthestLimits` would be switched wrongly on this refactoring commit. https://github.com/chartjs/Chart.js/pull/3625/commits/e1606f88ed4805815038cba4fdcd6211d7490356 --- diff --git a/src/scales/scale.radialLinear.js b/src/scales/scale.radialLinear.js index 5aa0c72c5..d61044eff 100644 --- a/src/scales/scale.radialLinear.js +++ b/src/scales/scale.radialLinear.js @@ -144,8 +144,8 @@ module.exports = function(Chart) { // Use this to calculate the offset + change. - Make sure L/R protrusion is at least 0 to stop issues with centre points var largestPossibleRadius = Math.min(scale.height / 2, scale.width / 2); var furthestLimits = { - l: scale.width, - r: 0, + r: scale.width, + l: 0, t: scale.height, b: 0 }; diff --git a/test/specs/scale.radialLinear.tests.js b/test/specs/scale.radialLinear.tests.js index baff12eb8..7796e1244 100644 --- a/test/specs/scale.radialLinear.tests.js +++ b/test/specs/scale.radialLinear.tests.js @@ -344,7 +344,7 @@ describe('Test the radial linear scale', function() { }); expect(chart.scale.drawingArea).toBe(233); - expect(chart.scale.xCenter).toBe(247); + expect(chart.scale.xCenter).toBe(256); expect(chart.scale.yCenter).toBe(280); }); @@ -393,7 +393,7 @@ describe('Test the radial linear scale', function() { expect(chart.scale.getDistanceFromCenterForValue(chart.scale.min)).toBe(0); expect(chart.scale.getDistanceFromCenterForValue(chart.scale.max)).toBe(233); expect(chart.scale.getPointPositionForValue(1, 5)).toEqual({ - x: 261, + x: 270, y: 275, });