mirror of
https://github.com/chartjs/Chart.js.git
synced 2024-10-07 04:39:06 +02:00
Merge pull request #2822 from chartjs/fix/2604
Allow passing a value to the time scale getPixelForValue method
This commit is contained in:
commit
05d41daa9e
@ -327,6 +327,7 @@ module.exports = function(Chart) {
|
|||||||
},
|
},
|
||||||
getPixelForValue: function(value, index, datasetIndex) {
|
getPixelForValue: function(value, index, datasetIndex) {
|
||||||
var me = this;
|
var me = this;
|
||||||
|
value = moment(value);
|
||||||
var labelMoment = value && value.isValid && value.isValid() ? value : me.getLabelMoment(datasetIndex, index);
|
var labelMoment = value && value.isValid && value.isValid() ? value : me.getLabelMoment(datasetIndex, index);
|
||||||
|
|
||||||
if (labelMoment) {
|
if (labelMoment) {
|
||||||
|
@ -391,6 +391,7 @@ describe('Time scale tests', function() {
|
|||||||
|
|
||||||
expect(xScale.getPixelForValue('', 0, 0)).toBeCloseToPixel(78);
|
expect(xScale.getPixelForValue('', 0, 0)).toBeCloseToPixel(78);
|
||||||
expect(xScale.getPixelForValue('', 6, 0)).toBeCloseToPixel(452);
|
expect(xScale.getPixelForValue('', 6, 0)).toBeCloseToPixel(452);
|
||||||
|
expect(xScale.getPixelForValue('2015-01-01T20:00:00')).toBeCloseToPixel(78);
|
||||||
|
|
||||||
expect(xScale.getValueForPixel(78)).toBeCloseToTime({
|
expect(xScale.getValueForPixel(78)).toBeCloseToTime({
|
||||||
value: moment(chartInstance.data.labels[0]),
|
value: moment(chartInstance.data.labels[0]),
|
||||||
|
Loading…
Reference in New Issue
Block a user