Small chores (#6740)

* Remove duplicate code
* Migrate `xLabel` and `yLabel` from docs & samples

diff --git a/docs/configuration/tooltip.md b/docs/configuration/tooltip.md
index 8ef57bbd68b26b5c8a6bebbdea8258639742d683..7ffefd93ddf9fe657af4f2e80228fc7c5aa284e1 100644 (file)
--- a/docs/configuration/tooltip.md
+++ b/docs/configuration/tooltip.md
@@ -136,7 +136,7 @@ var chart = new Chart(ctx, {
                     if (label) {
                         label += ': ';
                     }
-                    label += Math.round(tooltipItem.yLabel * 100) / 100;
+                    label += Math.round(tooltipItem.value * 100) / 100;
                     return label;
                 }
             }

diff --git a/samples/tooltips/custom-points.html b/samples/tooltips/custom-points.html
index 403d22e4eaddc201c0bde226c174ab20e2cdc2de..d65aa77bef7618366cea5eedaf34bfed120b52c0 100644 (file)
--- a/samples/tooltips/custom-points.html
+++ b/samples/tooltips/custom-points.html
@@ -57,7 +57,7 @@
 
                        if (tooltip.dataPoints.length > 0) {
                                tooltip.dataPoints.forEach(function(dataPoint) {
-                                       var content = [dataPoint.xLabel, dataPoint.yLabel].join(': ');
+                                       var content = [dataPoint.label, dataPoint.value].join(': ');
                                        var $tooltip = $('#tooltip-' + dataPoint.datasetIndex);
 
                                        $tooltip.html(content);

diff --git a/src/scales/scale.category.js b/src/scales/scale.category.js
index 1c9d3d91e35cd08fe79c240420fde8d79bef807d..1bf406fece599fdd52725d6a66762704d7888ca1 100644 (file)
--- a/src/scales/scale.category.js
+++ b/src/scales/scale.category.js
@@ -15,13 +15,6 @@ module.exports = Scale.extend({
                return first === -1 || first !== last ? index : first;
        },
 
-       _parseObject: function(obj, axis, index) {
-               if (obj[axis] !== undefined) {
-                       return this._parse(obj[axis], index);
-               }
-               return null;
-       },
-
        determineDataLimits: function() {
                var me = this;
                var max = me._getLabels().length - 1;