Bump version to 0.5.5

dietfriends · May 20, 2017 · c5c18b2 · c5c18b2
1 parent 5d67701
commit c5c18b2
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 20 deletions.
diff --git a/chartjs-plugin-annotation.js b/chartjs-plugin-annotation.js
@@ -1,7 +1,7 @@
 /*!
  * chartjs-plugin-annotation.js
  * http://chartjs.org/
- * Version: 0.5.4
+ * Version: 0.5.5
  *
  * Copyright 2016 Evert Timberg
  * Released under the MIT license
@@ -25,6 +25,20 @@ module.exports = function(Chart) {
 		});
 	}
 
+	function draw(drawTime) {
+		return function(chartInstance, easingDecimal) {
+			var defaultDrawTime = chartInstance.annotation.options.drawTime;
+
+			helpers.elements(chartInstance)
+				.filter(function(element) {
+					return drawTime === (element.options.drawTime || defaultDrawTime);
+				})
+				.forEach(function(element) {
+					element.transition(easingDecimal).draw();
+				});
+		};
+	}
+
 	return {
 		beforeInit: function(chartInstance) {
 			var chartOptions = chartInstance.options;
@@ -38,12 +52,6 @@ module.exports = function(Chart) {
 				supported: false
 			};
 
-			ns[ns.options.drawTime] = function(easingDecimal) {
-				helpers.elements(chartInstance).forEach(function(element) {
-					element.transition(easingDecimal).draw();
-				});
-			};
-
 			// Add the annotation scale adjuster to each scale's afterDataLimits hook
 			chartInstance.ensureScalesHaveIDs();
 			if (chartOptions.scales) {
@@ -103,15 +111,9 @@ module.exports = function(Chart) {
 				element.configure();
 			});
 		},
-		beforeDatasetsDraw: function(chartInstance, easingDecimal) {
-			(chartInstance.annotation.beforeDatasetsDraw || helpers.noop)(easingDecimal);
-		},
-		afterDatasetsDraw: function(chartInstance, easingDecimal) {
-			(chartInstance.annotation.afterDatasetsDraw || helpers.noop)(easingDecimal);
-		},
-		afterDraw: function(chartInstance, easingDecimal) {
-			(chartInstance.annotation.afterDraw || helpers.noop)(easingDecimal);
-		},
+		beforeDatasetsDraw: draw('beforeDatasetsDraw'),
+		afterDatasetsDraw: draw('afterDatasetsDraw'),
+		afterDraw: draw('afterDraw'),
 		afterInit: function(chartInstance) {
 			// Detect and intercept events that happen on an annotation element
 			var watchFor = chartInstance.annotation.options.events;
@@ -274,6 +276,7 @@ module.exports = function(Chart) {
 function noop() {}
 
 function elements(chartInstance) {
+	// Turn the elements object into an array of elements
 	var elements = chartInstance.annotation.elements;
 	return Object.keys(elements).map(function(id) {
 		return elements[id];
@@ -740,7 +743,20 @@ module.exports = function(Chart) {
 		},
 		inRange: function(mouseX, mouseY) {
 			var model = this._model;
-			return (model.line && model.line.intersects(mouseX, mouseY, this.getHeight()));
+
+			return (
+				// On the line
+				model.line &&
+				model.line.intersects(mouseX, mouseY, this.getHeight())
+			) || (
+				// On the label
+				model.labelEnabled &&
+				model.labelContent &&
+				mouseX >= model.labelX && 
+				mouseX <= model.labelX + model.labelWidth && 
+				mouseY >= model.labelY && 
+				mouseY <= model.labelY + model.labelHeight
+			);
 		},
 		getCenterPoint: function() {
 			return {