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 0b644c6444a2e8b1268ad21024b5965152903494..8d0bda0f3a67e80feae26ed1f0aac2b6e83bcda8 100644 (file)
--- 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) {