From: 100000001 <jaco@ngear.nl>
Date: Thu, 10 Mar 2016 08:05:59 +0000 (+0100)
Subject: Moved _model xAlign and yAlign setting to Positioning section and
X-Git-Tag: v2.0.0~22^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fpull%2F2116%2Fhead;p=thirdparty%2FChart.js.git

Moved _model xAlign and yAlign setting to Positioning section and
swapped y and x
---

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,