Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parse labels once when building time scale #3826

Merged
merged 1 commit into from
Feb 10, 2017
Merged

Parse labels once when building time scale #3826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 27 additions & 72 deletions src/scales/scale.time.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,6 @@ module.exports = function(Chart) {

Chart.Scale.prototype.initialize.call(this);
},
getLabelMoment: function(datasetIndex, index) {
if (datasetIndex === null || index === null) {
return null;
}

if (typeof this.labelMoments[datasetIndex] !== 'undefined') {
return this.labelMoments[datasetIndex][index];
}

return null;
},
getLabelDiff: function(datasetIndex, index) {
var me = this;
if (datasetIndex === null || index === null) {
Expand Down Expand Up @@ -114,49 +103,46 @@ module.exports = function(Chart) {
var me = this;
me.labelMoments = [];

function appendLabel(array, label) {
var labelMoment = me.parseTime(label);
if (labelMoment.isValid()) {
if (me.options.time.round) {
labelMoment.startOf(me.options.time.round);
}
array.push(labelMoment);
}
}

// Only parse these once. If the dataset does not have data as x,y pairs, we will use
// these
var scaleLabelMoments = [];
if (me.chart.data.labels && me.chart.data.labels.length > 0) {
helpers.each(me.chart.data.labels, function(label) {
var labelMoment = me.parseTime(label);

if (labelMoment.isValid()) {
if (me.options.time.round) {
labelMoment.startOf(me.options.time.round);
}
scaleLabelMoments.push(labelMoment);
}
appendLabel(scaleLabelMoments, label);
}, me);

me.firstTick = moment.min.call(me, scaleLabelMoments);
me.lastTick = moment.max.call(me, scaleLabelMoments);
me.firstTick = moment.min(scaleLabelMoments);
me.lastTick = moment.max(scaleLabelMoments);
} else {
me.firstTick = null;
me.lastTick = null;
}

helpers.each(me.chart.data.datasets, function(dataset, datasetIndex) {
var momentsForDataset = [];
var datasetVisible = me.chart.isDatasetVisible(datasetIndex);

if (typeof dataset.data[0] === 'object' && dataset.data[0] !== null) {
helpers.each(dataset.data, function(value) {
var labelMoment = me.parseTime(me.getRightValue(value));

if (labelMoment.isValid()) {
if (me.options.time.round) {
labelMoment.startOf(me.options.time.round);
}
momentsForDataset.push(labelMoment);

if (datasetVisible) {
// May have gone outside the scale ranges, make sure we keep the first and last ticks updated
me.firstTick = me.firstTick !== null ? moment.min(me.firstTick, labelMoment) : labelMoment;
me.lastTick = me.lastTick !== null ? moment.max(me.lastTick, labelMoment) : labelMoment;
}
}
appendLabel(momentsForDataset, me.getRightValue(value));
}, me);

if (me.chart.isDatasetVisible(datasetIndex)) {
// May have gone outside the scale ranges, make sure we keep the first and last ticks updated
var min = moment.min(momentsForDataset);
var max = moment.max(momentsForDataset);
me.firstTick = me.firstTick !== null ? moment.min(me.firstTick, min) : min;
me.lastTick = me.lastTick !== null ? moment.max(me.lastTick, max) : max;
}
} else {
// We have no labels. Use the ones from the scale
momentsForDataset = scaleLabelMoments;
Expand All @@ -180,43 +166,12 @@ module.exports = function(Chart) {
},
buildLabelDiffs: function() {
var me = this;
me.labelDiffs = [];
var scaleLabelDiffs = [];
// Parse common labels once
if (me.chart.data.labels && me.chart.data.labels.length > 0) {
helpers.each(me.chart.data.labels, function(label) {
var labelMoment = me.parseTime(label);

if (labelMoment.isValid()) {
if (me.options.time.round) {
labelMoment.startOf(me.options.time.round);
}
scaleLabelDiffs.push(labelMoment.diff(me.firstTick, me.tickUnit, true));
}
}, me);
}

helpers.each(me.chart.data.datasets, function(dataset) {
var diffsForDataset = [];

if (typeof dataset.data[0] === 'object' && dataset.data[0] !== null) {
helpers.each(dataset.data, function(value) {
var labelMoment = me.parseTime(me.getRightValue(value));

if (labelMoment.isValid()) {
if (me.options.time.round) {
labelMoment.startOf(me.options.time.round);
}
diffsForDataset.push(labelMoment.diff(me.firstTick, me.tickUnit, true));
}
}, me);
} else {
// We have no labels. Use common ones
diffsForDataset = scaleLabelDiffs;
}

me.labelDiffs.push(diffsForDataset);
}, me);
me.labelDiffs = me.labelMoments.map(function(datasetLabels) {
return datasetLabels.map(function(label) {
return label.diff(me.firstTick, me.tickUnit, true);
});
});
},
buildTicks: function() {
var me = this;
Expand Down
64 changes: 0 additions & 64 deletions test/scale.time.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,68 +485,4 @@ describe('Time scale tests', function() {
threshold: 0.75
});
});

it('should not throw an error if the datasetIndex is out of bounds', function() {
var chart = window.acquireChart({
type: 'line',
data: {
labels: ['2016-06-26'],
datasets: [{
xAxisID: 'xScale0',
data: [5]
}]
},
options: {
scales: {
xAxes: [{
id: 'xScale0',
display: true,
type: 'time',
}]
}
}
});

var xScale = chart.scales.xScale0;
var getOutOfBoundLabelMoment = function() {
xScale.getLabelMoment(12, 0);
};

expect(getOutOfBoundLabelMoment).not.toThrow();
});

it('should not throw an error if the datasetIndex or index are null', function() {
var chart = window.acquireChart({
type: 'line',
data: {
labels: ['2016-06-26'],
datasets: [{
xAxisID: 'xScale0',
data: [5]
}]
},
options: {
scales: {
xAxes: [{
id: 'xScale0',
display: true,
type: 'time',
}]
}
}
});

var xScale = chart.scales.xScale0;

var getNullDatasetIndexLabelMoment = function() {
xScale.getLabelMoment(null, 1);
};

var getNullIndexLabelMoment = function() {
xScale.getLabelMoment(1, null);
};

expect(getNullDatasetIndexLabelMoment).not.toThrow();
expect(getNullIndexLabelMoment).not.toThrow();
});
});