From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Fri, 13 May 2016 23:50:59 +0000 (-0400)
Subject: Error when first data point on time scale had null data
X-Git-Tag: v2.1.4~28^2
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fpull%2F2543%2Fhead;p=thirdparty%2FChart.js.git

Error when first data point on time scale had null data
---

diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js
index daf18814f..19079f0a5 100644
--- a/src/scales/scale.time.js
+++ b/src/scales/scale.time.js
@@ -114,7 +114,7 @@ module.exports = function(Chart) {
 				var momentsForDataset = [];
 				var datasetVisible = this.chart.isDatasetVisible(datasetIndex);
 
-				if (typeof dataset.data[0] === 'object') {
+				if (typeof dataset.data[0] === 'object' && dataset.data[0] !== null) {
 					helpers.each(dataset.data, function(value, index) {
 						var labelMoment = this.parseTime(this.getRightValue(value));