From: Simon Brunel <simonbrunel@users.noreply.github.com>
Date: Thu, 3 Nov 2016 21:43:52 +0000 (+0100)
Subject: Fix the event handler when legend is disabled (#3544)
X-Git-Tag: v2.4.0~1^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a94885e32d611723f35393726dac93872e1b1a74;p=thirdparty%2FChart.js.git

Fix the event handler when legend is disabled (#3544)

When legend is disabled (i.e. {options: {legend: false}}), me.legend is null. Add the same test on me.tooltip even if the tooltip object is always created in case of {options: {tooltips: false}}.
---

diff --git a/src/core/core.controller.js b/src/core/core.controller.js
index 0b644c644..8d0bda0f3 100644
--- a/src/core/core.controller.js
+++ b/src/core/core.controller.js
@@ -719,6 +719,8 @@ module.exports = function(Chart) {
 
 		eventHandler: function(e) {
 			var me = this;
+			var legend = me.legend;
+			var tooltip = me.tooltip;
 			var hoverOptions = me.options.hover;
 
 			// Buffer any update calls so that renders do not occur
@@ -726,8 +728,8 @@ module.exports = function(Chart) {
 			me._bufferedRequest = null;
 
 			var changed = me.handleEvent(e);
-			changed |= me.legend.handleEvent(e);
-			changed |= me.tooltip.handleEvent(e);
+			changed |= legend && legend.handleEvent(e);
+			changed |= tooltip && tooltip.handleEvent(e);
 
 			var bufferedRequest = me._bufferedRequest;
 			if (bufferedRequest) {