Merge pull request chartjs#2924 from jeffesp/master

Fixes chartjs#2923: swapped tooltip xAlign & yAlign
chargify · Jul 6, 2016 · fca419e · fca419e
2 parents 44a9866 + 0c5a17a
commit fca419e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/core/core.tooltip.js b/src/core/core.tooltip.js
@@ -158,8 +158,8 @@ module.exports = function(Chart) {
 					// Positioning
 					xPadding: tooltipOpts.xPadding,
 					yPadding: tooltipOpts.yPadding,
-					xAlign : tooltipOpts.yAlign,
-					yAlign : tooltipOpts.xAlign,
+					xAlign : tooltipOpts.xAlign,
+					yAlign : tooltipOpts.yAlign,
 
 					// Body
 					bodyFontColor: tooltipOpts.bodyFontColor,