Time scale: return time from getValueForPixel (#6616)

diff --git a/src/adapters/adapter.moment.js b/src/adapters/adapter.moment.js
index 435c474ad3b140e1312fd9aebec4cef7f3dc027d..79ecaa23682011f46efde3ea3b3934b4608a010d 100644 (file)
--- 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 7073412d824b612f8fe657267a164b7afe3da8c5..f87cf43ded4e7a40c475bad64000f79fcea1ed10 100644 (file)
--- 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 49377b480a9c33ad11421da04695a694a1760fef..2b82e4408d14b55293dd02a72bed04a2264583f5 100644 (file)
--- 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 71967491d4c85d6d959612e0dc1c8835c6b9c09a..421aab928b18a8782e8a9cf4a07ef7be50b77bf0 100755 (executable)
--- 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);