From: Jukka Kurkela <jukka.kurkela@gmail.com>
Date: Sun, 27 Oct 2019 20:36:57 +0000 (+0200)
Subject: Time scale: return time from getValueForPixel (#6616)
X-Git-Tag: v3.0.0-alpha~295
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b0a0b039ce30f40a5a4a6162667f9eaf4c62f0f;p=thirdparty%2FChart.js.git

Time scale: return time from getValueForPixel (#6616)
---

diff --git a/src/adapters/adapter.moment.js b/src/adapters/adapter.moment.js
index 435c474ad..79ecaa236 100644
--- a/src/adapters/adapter.moment.js
+++ b/src/adapters/adapter.moment.js
@@ -56,17 +56,5 @@ adapters._date.override(typeof moment === 'function' ? {
 
 	endOf: function(time, unit) {
 		return moment(time).endOf(unit).valueOf();
-	},
-
-	// DEPRECATIONS
-
-	/**
-	 * Provided for backward compatibility with scale.getValueForPixel().
-	 * @deprecated since version 2.8.0
-	 * @todo remove at version 3
-	 * @private
-	 */
-	_create: function(time) {
-		return moment(time);
-	},
+	}
 } : {});
diff --git a/src/core/core.adapters.js b/src/core/core.adapters.js
index 7073412d8..f87cf43de 100644
--- a/src/core/core.adapters.js
+++ b/src/core/core.adapters.js
@@ -98,20 +98,7 @@ helpers.extend(DateAdapter.prototype, /** @lends DateAdapter */ {
 	 * @param {Unit} unit - the unit as string
 	 * @function
 	 */
-	endOf: abstract,
-
-	// DEPRECATIONS
-
-	/**
-	 * Provided for backward compatibility for scale.getValueForPixel(),
-	 * this method should be overridden only by the moment adapter.
-	 * @deprecated since version 2.8.0
-	 * @todo remove at version 3
-	 * @private
-	 */
-	_create: function(value) {
-		return value;
-	}
+	endOf: abstract
 });
 
 DateAdapter.override = function(members) {
diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js
index 49377b480..2b82e4408 100644
--- a/src/scales/scale.time.js
+++ b/src/scales/scale.time.js
@@ -706,10 +706,7 @@ module.exports = Scale.extend({
 		var me = this;
 		var offsets = me._offsets;
 		var pos = me.getDecimalForPixel(pixel) / offsets.factor - offsets.end;
-		var time = interpolate(me._table, 'pos', pos, 'time');
-
-		// DEPRECATION, we should return time directly
-		return me._adapter._create(time);
+		return interpolate(me._table, 'pos', pos, 'time');
 	},
 
 	/**
diff --git a/test/specs/scale.time.tests.js b/test/specs/scale.time.tests.js
index 71967491d..421aab928 100755
--- a/test/specs/scale.time.tests.js
+++ b/test/specs/scale.time.tests.js
@@ -28,9 +28,9 @@ describe('Time scale tests', function() {
 		jasmine.addMatchers({
 			toBeCloseToTime: function() {
 				return {
-					compare: function(actual, expected) {
+					compare: function(time, expected) {
 						var result = false;
-
+						var actual = moment(time);
 						var diff = actual.diff(expected.value, expected.unit, true);
 						result = Math.abs(diff) < (expected.threshold !== undefined ? expected.threshold : 0.01);