Add description on tick label callback parameter

chartjs · Mar 23, 2019 · 962eade · 962eade
1 parent 967ff23
commit 962eade
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/docs/axes/labelling.md b/docs/axes/labelling.md
@@ -42,3 +42,5 @@ var chart = new Chart(ctx, {
     }
 });
 ```
+
+The third parameter passed to the callback function is an array of labels, but in the time scale, it is an array of `{label: string, major: boolean}` objects.
diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js
@@ -668,8 +668,10 @@ module.exports = Scale.extend({
 		var label = adapter.format(time, format ? format : major ? majorFormat : minorFormat);
 		var nestedTickOpts = major ? majorTickOpts : tickOpts.minor;
 		var formatter = helpers.options.resolve([
-			nestedTickOpts.callback, nestedTickOpts.userCallback,
-			tickOpts.callback, tickOpts.userCallback
+			nestedTickOpts.callback,
+			nestedTickOpts.userCallback,
+			tickOpts.callback,
+			tickOpts.userCallback
 		]);
 
 		return formatter ? formatter(label, index, ticks) : label;