Skip to content

Tooltip options fontColor fixed #2730

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

Merged
merged 5 commits into from
Jun 8, 2016
Merged

Tooltip options fontColor fixed #2730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7ebf85e
change tooltip font color option
Jun 8, 2016
5687aa4
Fix tooltip core test case
Jun 8, 2016
d6e5b5e
core tooltip test case fixe
Jack-Valentine Jun 8, 2016
99d3f42
titleColor options is not available
Jack-Valentine Jun 8, 2016
29bc3b0
ChartJS tooltip fontColor fix
Jack-Valentine Jun 8, 2016
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
28 changes: 14 additions & 14 deletions src/core/core.tooltip.js
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ module.exports = function(Chart) {
titleFontStyle: "bold",
titleSpacing: 2,
titleMarginBottom: 6,
titleColor: "#fff",
titleFontColor: "#fff",
titleAlign: "left",
bodySpacing: 2,
bodyColor: "#fff",
bodyFontColor: "#fff",
bodyAlign: "left",
footerFontStyle: "bold",
footerSpacing: 2,
footerMarginTop: 6,
footerColor: "#fff",
footerFontColor: "#fff",
footerAlign: "left",
yPadding: 6,
xPadding: 6,
Expand Down Expand Up @@ -159,15 +159,15 @@ module.exports = function(Chart) {
yAlign : tooltipOpts.xAlign,

// Body
bodyColor: tooltipOpts.bodyColor,
bodyFontColor: tooltipOpts.bodyFontColor,
_bodyFontFamily: getValueOrDefault(tooltipOpts.bodyFontFamily, globalDefaults.defaultFontFamily),
_bodyFontStyle: getValueOrDefault(tooltipOpts.bodyFontStyle, globalDefaults.defaultFontStyle),
_bodyAlign: tooltipOpts.bodyAlign,
bodyFontSize: getValueOrDefault(tooltipOpts.bodyFontSize, globalDefaults.defaultFontSize),
bodySpacing: tooltipOpts.bodySpacing,

// Title
titleColor: tooltipOpts.titleColor,
titleFontColor: tooltipOpts.titleFontColor,
_titleFontFamily: getValueOrDefault(tooltipOpts.titleFontFamily, globalDefaults.defaultFontFamily),
_titleFontStyle: getValueOrDefault(tooltipOpts.titleFontStyle, globalDefaults.defaultFontStyle),
titleFontSize: getValueOrDefault(tooltipOpts.titleFontSize, globalDefaults.defaultFontSize),
Expand All @@ -176,7 +176,7 @@ module.exports = function(Chart) {
titleMarginBottom: tooltipOpts.titleMarginBottom,

// Footer
footerColor: tooltipOpts.footerColor,
footerFontColor: tooltipOpts.footerFontColor,
_footerFontFamily: getValueOrDefault(tooltipOpts.footerFontFamily, globalDefaults.defaultFontFamily),
_footerFontStyle: getValueOrDefault(tooltipOpts.footerFontStyle, globalDefaults.defaultFontStyle),
footerFontSize: getValueOrDefault(tooltipOpts.footerFontSize, globalDefaults.defaultFontSize),
Expand Down Expand Up @@ -571,8 +571,8 @@ module.exports = function(Chart) {
var titleFontSize = vm.titleFontSize,
titleSpacing = vm.titleSpacing;

var titleColor = helpers.color(vm.titleColor);
ctx.fillStyle = titleColor.alpha(opacity * titleColor.alpha()).rgbString();
var titleFontColor = helpers.color(vm.titleFontColor);
ctx.fillStyle = titleFontColor.alpha(opacity * titleFontColor.alpha()).rgbString();
ctx.font = helpers.fontString(titleFontSize, vm._titleFontStyle, vm._titleFontFamily);

var i, len;
Expand All @@ -594,8 +594,8 @@ module.exports = function(Chart) {
ctx.textAlign = vm._bodyAlign;
ctx.textBaseline = "top";

var bodyColor = helpers.color(vm.bodyColor);
var textColor = bodyColor.alpha(opacity * bodyColor.alpha()).rgbString();
var bodyFontColor = helpers.color(vm.bodyFontColor);
var textColor = bodyFontColor.alpha(opacity * bodyFontColor.alpha()).rgbString();
ctx.fillStyle = textColor;
ctx.font = helpers.fontString(bodyFontSize, vm._bodyFontStyle, vm._bodyFontFamily);

Expand All @@ -611,7 +611,7 @@ module.exports = function(Chart) {

var drawColorBoxes = body.length > 1;
xLinePadding = drawColorBoxes ? (bodyFontSize + 2) : 0;

// Draw body lines now
helpers.each(body, function(bodyItem, i) {
helpers.each(bodyItem.before, fillLineOfText);
Expand All @@ -636,7 +636,7 @@ module.exports = function(Chart) {

fillLineOfText(line);
});

helpers.each(bodyItem.after, fillLineOfText);
});

Expand All @@ -656,8 +656,8 @@ module.exports = function(Chart) {
ctx.textAlign = vm._footerAlign;
ctx.textBaseline = "top";

var footerColor = helpers.color(vm.footerColor);
ctx.fillStyle = footerColor.alpha(opacity * footerColor.alpha()).rgbString();
var footerFontColor = helpers.color(vm.footerFontColor);
ctx.fillStyle = footerFontColor.alpha(opacity * footerFontColor.alpha()).rgbString();
ctx.font = helpers.fontString(vm.footerFontSize, vm._footerFontStyle, vm._footerFontFamily);

helpers.each(footer, function(line) {
Expand Down
28 changes: 14 additions & 14 deletions test/core.tooltip.tests.js
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ describe('tooltip tests', function() {
}
});

// Trigger an event over top of the
// Trigger an event over top of the
var meta = chartInstance.getDatasetMeta(0);
var point = meta.data[1];

Expand Down Expand Up @@ -63,15 +63,15 @@ describe('tooltip tests', function() {
yAlign: 'center',

// Body
bodyColor: '#fff',
bodyFontColor: '#fff',
_bodyFontFamily: globalDefaults.defaultFontFamily,
_bodyFontStyle: globalDefaults.defaultFontStyle,
_bodyAlign: 'left',
bodyFontSize: globalDefaults.defaultFontSize,
bodySpacing: 2,

// Title
titleColor: '#fff',
titleFontColor: '#fff',
_titleFontFamily: globalDefaults.defaultFontFamily,
_titleFontStyle: 'bold',
titleFontSize: globalDefaults.defaultFontSize,
Expand All @@ -80,7 +80,7 @@ describe('tooltip tests', function() {
titleMarginBottom: 6,

// Footer
footerColor: '#fff',
footerFontColor: '#fff',
_footerFontFamily: globalDefaults.defaultFontFamily,
_footerFontStyle: 'bold',
footerFontSize: globalDefaults.defaultFontSize,
Expand Down Expand Up @@ -147,7 +147,7 @@ describe('tooltip tests', function() {
}
});

// Trigger an event over top of the
// Trigger an event over top of the
var meta = chartInstance.getDatasetMeta(0);
var point = meta.data[1];

Expand Down Expand Up @@ -177,15 +177,15 @@ describe('tooltip tests', function() {
yAlign: 'center',

// Body
bodyColor: '#fff',
bodyFontColor: '#fff',
_bodyFontFamily: globalDefaults.defaultFontFamily,
_bodyFontStyle: globalDefaults.defaultFontStyle,
_bodyAlign: 'left',
bodyFontSize: globalDefaults.defaultFontSize,
bodySpacing: 2,

// Title
titleColor: '#fff',
titleFontColor: '#fff',
_titleFontFamily: globalDefaults.defaultFontFamily,
_titleFontStyle: 'bold',
titleFontSize: globalDefaults.defaultFontSize,
Expand All @@ -194,7 +194,7 @@ describe('tooltip tests', function() {
titleMarginBottom: 6,

// Footer
footerColor: '#fff',
footerFontColor: '#fff',
_footerFontFamily: globalDefaults.defaultFontFamily,
_footerFontStyle: 'bold',
footerFontSize: globalDefaults.defaultFontSize,
Expand Down Expand Up @@ -286,7 +286,7 @@ describe('tooltip tests', function() {
}
});

// Trigger an event over top of the
// Trigger an event over top of the
var meta = chartInstance.getDatasetMeta(0);
var point = meta.data[1];

Expand Down Expand Up @@ -316,15 +316,15 @@ describe('tooltip tests', function() {
yAlign: 'top',

// Body
bodyColor: '#fff',
bodyFontColor: '#fff',
_bodyFontFamily: globalDefaults.defaultFontFamily,
_bodyFontStyle: globalDefaults.defaultFontStyle,
_bodyAlign: 'left',
bodyFontSize: globalDefaults.defaultFontSize,
bodySpacing: 2,

// Title
titleColor: '#fff',
titleFontColor: '#fff',
_titleFontFamily: globalDefaults.defaultFontFamily,
_titleFontStyle: 'bold',
titleFontSize: globalDefaults.defaultFontSize,
Expand All @@ -333,7 +333,7 @@ describe('tooltip tests', function() {
titleMarginBottom: 6,

// Footer
footerColor: '#fff',
footerFontColor: '#fff',
_footerFontFamily: globalDefaults.defaultFontFamily,
_footerFontStyle: 'bold',
footerFontSize: globalDefaults.defaultFontSize,
Expand Down Expand Up @@ -403,7 +403,7 @@ describe('tooltip tests', function() {
}
});

// Trigger an event over top of the
// Trigger an event over top of the
var meta0 = chartInstance.getDatasetMeta(0);
var point0 = meta0.data[1];

Expand All @@ -426,7 +426,7 @@ describe('tooltip tests', function() {

// Check and see if tooltip was displayed
var tooltip = chartInstance.tooltip;

expect(tooltip._view).toEqual(jasmine.objectContaining({
// Positioning
xAlign: 'left',
Expand Down