]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Consider left and top when determining value from pixel in category scale 2870/head
authorEvert Timberg <evert.timberg+github@gmail.com>
Wed, 29 Jun 2016 11:00:09 +0000 (07:00 -0400)
committerEvert Timberg <evert.timberg+github@gmail.com>
Wed, 29 Jun 2016 11:00:09 +0000 (07:00 -0400)
src/scales/scale.category.js
test/scale.category.tests.js

index fc1d69eb692bbb075d1aa531bb6198a8d07da7f3..fe18a310038f5fd58b2461272913d3c6c909b48c 100644 (file)
@@ -81,6 +81,8 @@ module.exports = function(Chart) {
                        var innerDimension = horz ? me.width - (me.paddingLeft + me.paddingRight) : me.height - (me.paddingTop + me.paddingBottom);
                        var valueDimension = innerDimension / offsetAmt;
 
+                       pixel -= horz ? me.left : me.top;
+
                        if (me.options.gridLines.offsetGridLines) {
                                pixel -= (valueDimension / 2);
                        }
index c717b684f848e6c564a2dfb8af5dc85c76e77a4b..3b6ebc3d7655aac847316e94d83ef502814d8bc1 100644 (file)
@@ -154,7 +154,7 @@ describe('Category scale tests', function() {
 
                expect(scale.getPixelForValue(0, 4, 0, false)).toBe(452);
                expect(scale.getPixelForValue(0, 4, 0, true)).toBe(505);
-               expect(scale.getValueForPixel(452)).toBe(4);
+               expect(scale.getValueForPixel(453)).toBe(4);
                expect(scale.getValueForPixel(505)).toBe(4);
 
                config.gridLines.offsetGridLines = false;
@@ -282,7 +282,7 @@ describe('Category scale tests', function() {
 
                expect(scale.getPixelForValue(0, 4, 0, false)).toBe(161);
                expect(scale.getPixelForValue(0, 4, 0, true)).toBe(180);
-               expect(scale.getValueForPixel(161)).toBe(4);
+               expect(scale.getValueForPixel(162)).toBe(4);
 
                config.gridLines.offsetGridLines = false;