From: Tanner Linsley Date: Tue, 16 Jun 2015 04:43:45 +0000 (-0600) Subject: Better getElementAtEvent function X-Git-Tag: 2.0.0-alpha3~10^2~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76e060cf97b2be1377106c2b9ba945042a4797cc;p=thirdparty%2FChart.js.git Better getElementAtEvent function --- diff --git a/src/core/core.controller.js b/src/core/core.controller.js index 0bf8aeae2..694af7661 100644 --- a/src/core/core.controller.js +++ b/src/core/core.controller.js @@ -209,18 +209,18 @@ getElementAtEvent: function(e) { var eventPosition = helpers.getRelativePosition(e); - var element = []; + var elementsArray = []; helpers.each(this.data.datasets, function(dataset, datasetIndex) { helpers.each(dataset.metaData, function(element, index) { - if (this.chart.data.datasets[datasetIndex].metaData[elementIndex].inRange(eventPosition.x, eventPosition.y)) { - element.push(this.chart.data.datasets[datasetIndex].metaData[elementIndex]); - return element; + if (element.inRange(eventPosition.x, eventPosition.y)) { + elementsArray.push(element); + return elementsArray; } }, this); }, this); - return []; + return elementsArray; }, getElementsAtEvent: function(e) {