From: etimberg <evert.timberg@gmail.com>
Date: Sun, 22 Nov 2015 03:44:11 +0000 (-0500)
Subject: Minor improvement to code that gets active elements
X-Git-Tag: 2.0.0-beta2~25^2~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a17edd1ae9e487df00ca8da6fc188b82ea92170;p=thirdparty%2FChart.js.git

Minor improvement to code that gets active elements
---

diff --git a/src/core/core.controller.js b/src/core/core.controller.js
index 2758ef2ba..2b78ab233 100644
--- a/src/core/core.controller.js
+++ b/src/core/core.controller.js
@@ -420,30 +420,23 @@
 				this.active = [];
 				this.tooltipActive = [];
 			} else {
-				this.active = function() {
-					switch (this.options.hover.mode) {
-						case 'single':
-							return this.getElementAtEvent(e);
-						case 'label':
-							return this.getElementsAtEvent(e);
-						case 'dataset':
-							return this.getDatasetAtEvent(e);
-						default:
-							return e;
-					}
-				}.call(this);
-				this.tooltipActive = function() {
-					switch (this.options.tooltips.mode) {
+
+				var _this = this;
+				function getItemsForMode(mode) {
+					switch (mode) {
 						case 'single':
-							return this.getElementAtEvent(e);
+							return _this.getElementAtEvent(e);
 						case 'label':
-							return this.getElementsAtEvent(e);
+							return _this.getElementsAtEvent(e);
 						case 'dataset':
-							return this.getDatasetAtEvent(e);
+							return _this.getDatasetAtEvent(e);
 						default:
 							return e;
 					}
-				}.call(this);
+				}
+
+				this.active = getItemsForMode(this.options.hover.mode);
+				this.tooltipActive = getItemsForMode(this.options.tooltips.mode);
 			}
 
 			// On Hover hook