Mirrors/Chart.js
1
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2024-10-07 04:39:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2822 from chartjs/fix/2604

Browse Source 
Allow passing a value to the time scale getPixelForValue method
This commit is contained in:
Evert Timberg 2016-06-22 21:45:59 -04:00 committed by GitHub
commit 05d41daa9e
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/scales/scale.time.js
View 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) {

1
test/scale.time.tests.js
View 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]),