From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Mon, 9 May 2016 22:14:25 +0000 (-0400)
Subject: allow callback or userCallback in the time scale
X-Git-Tag: v2.1.3~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebffa52dc2ad3c2fc5a1b3f48e4fb8596334a9ee;p=thirdparty%2FChart.js.git

allow callback or userCallback in the time scale
---

diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js
index b57a09113..1a2fccf0d 100644
--- a/src/scales/scale.time.js
+++ b/src/scales/scale.time.js
@@ -299,9 +299,11 @@ module.exports = function(Chart) {
 		// Function to format an individual tick mark
 		tickFormatFunction: function tickFormatFunction(tick, index, ticks) {
 			var formattedTick = tick.format(this.displayFormat);
+			var tickOpts = this.options.ticks;
+			var callback = helpers.getValueOrDefault(tickOpts.callback, tickOpts.userCallback);
 
-			if (this.options.ticks.userCallback) {
-				return this.options.ticks.userCallback(formattedTick, index, ticks);
+			if (callback) {
+				return callback(formattedTick, index, ticks);
 			} else {
 				return formattedTick;
 			}