Mirrors/Chart.js
2
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2026-03-04 15:34:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

When the dataset label is not defined, the tooltip label string should not include a ':' character. Added a test to cover this case.

Browse Source
This commit is contained in:
Evert Timberg
2017-01-28 17:06:20 -05:00
parent 8f217182b8
commit fed42e218a
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/core.tooltip.js
View File

@@ -67,8 +67,13 @@ module.exports = function(Chart) {
// Args are: (tooltipItem, data)
beforeLabel: helpers.noop,
label: function(tooltipItem, data) {
var datasetLabel = data.datasets[tooltipItem.datasetIndex].label || '';
return datasetLabel + ': ' + tooltipItem.yLabel;
var label = data.datasets[tooltipItem.datasetIndex].label || '';
if (label) {
label += ': ';
}
label += tooltipItem.yLabel;
return label;
},
labelColor: function(tooltipItem, chart) {
var meta = chart.getDatasetMeta(tooltipItem.datasetIndex);

28
test/core.tooltip.tests.js
View File

@@ -1,5 +1,31 @@
// Test the rectangle element
describe('Core.Tooltip', function() {
describe('config', function() {
it('should not include the dataset label in the body string if not defined', function() {
var data = {
datasets: [{
data: [10, 20, 30],
pointHoverBorderColor: 'rgb(255, 0, 0)',
pointHoverBackgroundColor: 'rgb(0, 255, 0)'
}],
labels: ['Point 1', 'Point 2', 'Point 3']
};
var tooltipItem = {
index: 1,
datasetIndex: 0,
xLabel: 'Point 2',
yLabel: '20'
};
var label = Chart.defaults.global.tooltips.callbacks.label(tooltipItem, data);
expect(label).toBe('20');
data.datasets[0].label = 'My dataset';
label = Chart.defaults.global.tooltips.callbacks.label(tooltipItem, data);
expect(label).toBe('My dataset: 20');
});
});
describe('index mode', function() {
it('Should only use x distance when intersect is false', function() {
var chart = window.acquireChart({
@@ -463,7 +489,7 @@ describe('Core.Tooltip', function() {
expect(tooltip._view.y).toBeCloseToPixel(190);
});
it('Should display information from user callbacks', function() {
it('Should allow sorting items', function() {
var chart = window.acquireChart({
type: 'line',
data: {