From 5d2444a5ee1a4caf3d7b3721eab759763ec1cf12 Mon Sep 17 00:00:00 2001 From: 100000001 Date: Thu, 10 Mar 2016 09:00:26 +0100 Subject: [PATCH 1/2] Expose yAlign and xAlign as a tooltip option --- src/core/core.tooltip.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/core/core.tooltip.js b/src/core/core.tooltip.js index b3a610156..8ff2da9c4 100644 --- a/src/core/core.tooltip.js +++ b/src/core/core.tooltip.js @@ -24,6 +24,8 @@ module.exports = function(Chart) { footerAlign: "left", yPadding: 6, xPadding: 6, + yAlign : 'center', + xAlign : 'center', caretSize: 5, cornerRadius: 6, multiKeyBackground: '#fff', @@ -116,6 +118,8 @@ module.exports = function(Chart) { footerMarginTop: options.tooltips.footerMarginTop, // Appearance + yAlign : options.tooltips.yAlign, + xAlign : options.tooltips.xAlign, caretSize: options.tooltips.caretSize, cornerRadius: options.tooltips.cornerRadius, backgroundColor: options.tooltips.backgroundColor, @@ -333,8 +337,6 @@ module.exports = function(Chart) { return size; }, determineAlignment: function determineAlignment(size) { - this._model.xAlign = this._model.yAlign = "center"; - if (this._model.y < size.height) { this._model.yAlign = 'top'; } else if (this._model.y > (this._chart.height - size.height)) { From 136efeaf4d8af97b43daee57620be4fd68c2e5de Mon Sep 17 00:00:00 2001 From: 100000001 Date: Thu, 10 Mar 2016 09:05:59 +0100 Subject: [PATCH 2/2] Moved _model xAlign and yAlign setting to Positioning section and swapped y and x --- src/core/core.tooltip.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/core.tooltip.js b/src/core/core.tooltip.js index 8ff2da9c4..ddf78f62a 100644 --- a/src/core/core.tooltip.js +++ b/src/core/core.tooltip.js @@ -90,6 +90,8 @@ module.exports = function(Chart) { // Positioning xPadding: options.tooltips.xPadding, yPadding: options.tooltips.yPadding, + xAlign : options.tooltips.yAlign, + yAlign : options.tooltips.xAlign, // Body bodyColor: options.tooltips.bodyColor, @@ -118,8 +120,6 @@ module.exports = function(Chart) { footerMarginTop: options.tooltips.footerMarginTop, // Appearance - yAlign : options.tooltips.yAlign, - xAlign : options.tooltips.xAlign, caretSize: options.tooltips.caretSize, cornerRadius: options.tooltips.cornerRadius, backgroundColor: options.tooltips.backgroundColor,