From: 문승찬 Date: Wed, 8 Jun 2016 01:16:38 +0000 (+0900) Subject: change tooltip font color option X-Git-Tag: v2.1.5~9^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ebf85eacf18585f94aad5a82e8a785e79084c0b;p=thirdparty%2FChart.js.git change tooltip font color option bodyColor -> bodyFontColor titleColor -> titleFontColor footerColor -> footerFontColor --- diff --git a/src/core/core.tooltip.js b/src/core/core.tooltip.js old mode 100644 new mode 100755 index 113c94f41..2488569b4 --- a/src/core/core.tooltip.js +++ b/src/core/core.tooltip.js @@ -159,7 +159,7 @@ 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, @@ -167,7 +167,7 @@ module.exports = function(Chart) { 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), @@ -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), @@ -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); @@ -636,7 +636,7 @@ module.exports = function(Chart) { fillLineOfText(line); }); - + helpers.each(bodyItem.after, fillLineOfText); });