]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Use proper reverse option in radial linear scale
authoretimberg <evert.timberg@gmail.com>
Mon, 3 Jul 2017 23:50:08 +0000 (19:50 -0400)
committerEvert Timberg <evert.timberg+github@gmail.com>
Tue, 4 Jul 2017 11:25:58 +0000 (07:25 -0400)
src/scales/scale.radialLinear.js
test/specs/scale.radialLinear.tests.js

index 845dc5ded64caf1fa6dd70d0a8f6816f01a08ddb..90cb52cd09024b456d23cb1f1d606c5da976254c 100644 (file)
@@ -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;
 
index e966e1229f07da8c8220695f8d1b20e1c20c73ed..a8ac68ff13ac5e2beb2d2c1ab094177dc617ea0f 100644 (file)
@@ -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);