]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Allow passing a value to the time scale getPixelForValue method 2822/head
authorEvert Timberg <evert.timberg+github@gmail.com>
Tue, 21 Jun 2016 23:03:30 +0000 (19:03 -0400)
committerEvert Timberg <evert.timberg+github@gmail.com>
Tue, 21 Jun 2016 23:03:30 +0000 (19:03 -0400)
src/scales/scale.time.js
test/scale.time.tests.js

index 8a4fe2709c2a3f7895477c79311f9dd25477cfad..3ada3e5e4d6e58d3640758c3b9763816f3d61762 100644 (file)
@@ -327,6 +327,7 @@ module.exports = function(Chart) {
                },
                getPixelForValue: function(value, index, datasetIndex) {
                        var me = this;
+                       value = moment(value);
                        var labelMoment = value && value.isValid && value.isValid() ? value : me.getLabelMoment(datasetIndex, index);
 
                        if (labelMoment) {
index 9966f9cc0f0f3123cde19641868a087e4aa51013..27af3ed54d809776bda028c36647e7cb2533fe7e 100644 (file)
@@ -391,6 +391,7 @@ describe('Time scale tests', function() {
 
                expect(xScale.getPixelForValue('', 0, 0)).toBeCloseToPixel(78);
                expect(xScale.getPixelForValue('', 6, 0)).toBeCloseToPixel(452);
+               expect(xScale.getPixelForValue('2015-01-01T20:00:00')).toBeCloseToPixel(78);
 
                expect(xScale.getValueForPixel(78)).toBeCloseToTime({
                        value: moment(chartInstance.data.labels[0]),