From 7d60857819eaab2c16aea4ac7eb527a6ce8df844 Mon Sep 17 00:00:00 2001 From: etimberg Date: Mon, 3 Jul 2017 19:50:08 -0400 Subject: [PATCH] Use proper reverse option in radial linear scale --- src/scales/scale.radialLinear.js | 7 ++++--- test/specs/scale.radialLinear.tests.js | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/scales/scale.radialLinear.js b/src/scales/scale.radialLinear.js index 845dc5ded..90cb52cd0 100644 --- a/src/scales/scale.radialLinear.js +++ b/src/scales/scale.radialLinear.js @@ -244,7 +244,7 @@ module.exports = function(Chart) { ctx.lineWidth = angleLineOpts.lineWidth; ctx.strokeStyle = angleLineOpts.color; - var outerDistance = scale.getDistanceFromCenterForValue(opts.reverse ? scale.min : scale.max); + var outerDistance = scale.getDistanceFromCenterForValue(opts.ticks.reverse ? scale.min : scale.max); // Point Label Font var plFont = getPointLabelFontOptions(scale); @@ -366,6 +366,7 @@ module.exports = function(Chart) { }, convertTicksToLabels: function() { var me = this; + Chart.LinearScaleBase.prototype.convertTicksToLabels.call(me); // Point labels @@ -433,7 +434,7 @@ module.exports = function(Chart) { // Take into account half font size + the yPadding of the top value var scalingFactor = me.drawingArea / (me.max - me.min); - if (me.options.reverse) { + if (me.options.ticks.reverse) { return (me.max - value) * scalingFactor; } return (value - me.min) * scalingFactor; @@ -480,7 +481,7 @@ module.exports = function(Chart) { helpers.each(me.ticks, function(label, index) { // Don't draw a centre value (if it is minimum) - if (index > 0 || opts.reverse) { + if (index > 0 || tickOpts.reverse) { var yCenterOffset = me.getDistanceFromCenterForValue(me.ticksAsNumbers[index]); var yHeight = me.yCenter - yCenterOffset; diff --git a/test/specs/scale.radialLinear.tests.js b/test/specs/scale.radialLinear.tests.js index e966e1229..a8ac68ff1 100644 --- a/test/specs/scale.radialLinear.tests.js +++ b/test/specs/scale.radialLinear.tests.js @@ -401,7 +401,7 @@ describe('Test the radial linear scale', function() { y: 275, }); - chart.scale.options.reverse = true; + chart.scale.options.ticks.reverse = true; chart.update(); expect(chart.scale.getDistanceFromCenterForValue(chart.scale.min)).toBe(233);