Allow specifying labels in time scale options

chartjs · May 8, 2019 · dc4f183 · dc4f183
1 parent ddee91e
commit dc4f183
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docs/axes/cartesian/time.md b/docs/axes/cartesian/time.md
@@ -149,7 +149,7 @@ The `ticks.source` property controls the ticks generation.
 
 * `'auto'`: generates "optimal" ticks based on scale size and time options
 * `'data'`: generates ticks from data (including labels from data `{t|x|y}` objects)
-* `'labels'`: generates ticks from user given `data.labels` values ONLY
+* `'labels'`: generates ticks from user given `scale.labels` or `data.labels` values ONLY
 
 ### Parser
 If this property is defined as a string, it is interpreted as a custom format to be used by Moment.js to parse the date.

diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js
@@ -524,7 +524,7 @@ module.exports = Scale.extend({
 		var datasets = [];
 		var labels = [];
 		var i, j, ilen, jlen, data, timestamp;
-		var dataLabels = chart.data.labels || [];
+		var dataLabels = options.labels || chart.data.labels || [];
 
 		// Convert labels to timestamps
 		for (i = 0, ilen = dataLabels.length; i < ilen; ++i) {