Fix multi-dataset bar highlighting and bar highlight color logic

diff --git a/Chart.js b/Chart.js
index 21edb16a8b4a7be89bae28dbd48ca552e7c9bf85..7cdf767e314a3596736c2a0f0bdb54017464cb5d 100644 (file)
--- a/Chart.js
+++ b/Chart.js
@@ -2335,10 +2335,8 @@
                                                bar.restore(['fillColor', 'strokeColor']);
                                        });
                                        helpers.each(activeBars, function(activeBar){
-                                               if (activeBar) {
-                                                       activeBar.fillColor = activeBar.highlightFill;
-                                                       activeBar.strokeColor = activeBar.highlightStroke;
-                                               }
+                                               activeBar.fillColor = activeBar.highlightFill;
+                                               activeBar.strokeColor = activeBar.highlightStroke;
                                        });
                                        this.showTooltip(activeBars);
                                });
@@ -3731,4 +3729,4 @@
 
 
 
-}).call(this);
+}).call(this);
\ No newline at end of file