Merge pull request #3039 from ianks/getLabelMoment-fix

Fix out of bounds index access in getLabelMoment
chartjs · Jul 27, 2016 · 8e2deed · 8e2deed
2 parents a0d8554 + e4dd158
commit 8e2deed
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js
@@ -76,7 +76,11 @@ module.exports = function(Chart) {
 			Chart.Scale.prototype.initialize.call(this);
 		},
 		getLabelMoment: function(datasetIndex, index) {
-			return this.labelMoments[datasetIndex][index];
+			if (typeof this.labelMoments[datasetIndex] != 'undefined') {
+				return this.labelMoments[datasetIndex][index];
+			}
+
+			return null;
 		},
 		getMomentStartOf: function(tick) {
 			var me = this;

diff --git a/test/scale.time.tests.js b/test/scale.time.tests.js
@@ -479,4 +479,33 @@ describe('Time scale tests', function() {
 			threshold: 0.75
 		});
 	});
+
+	it("should not throw an error if the datasetIndex is out of bounds", function() {
+		var chart = window.acquireChart({
+			type: 'line',
+			data: {
+				labels: ["2016-06-26"],
+				datasets: [{
+					type: "line",
+					data: [5]
+				}]
+			},
+			options: {
+				scales: {
+					xAxes: [{
+						display: true,
+						type: "time",
+					}]
+				}
+			}
+		});
+
+		var xScale = chartInstance.scales.xScale0;
+
+		var getOutOfBoundPixelForValue = function() {
+			xScale.getLabelMoment(12, 0);
+		};
+
+		expect(getOutOfBoundPixelForValue).not.toThrow();
+	});
 });