From: Evert Timberg Date: Tue, 21 Jun 2016 23:03:30 +0000 (-0400) Subject: Allow passing a value to the time scale getPixelForValue method X-Git-Tag: v2.2.0-rc.1~34^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2822%2Fhead;p=thirdparty%2FChart.js.git Allow passing a value to the time scale getPixelForValue method --- diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js index 8a4fe2709..3ada3e5e4 100644 --- a/src/scales/scale.time.js +++ b/src/scales/scale.time.js @@ -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) { diff --git a/test/scale.time.tests.js b/test/scale.time.tests.js index 9966f9cc0..27af3ed54 100644 --- a/test/scale.time.tests.js +++ b/test/scale.time.tests.js @@ -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]),