Review comments

chartjs · Oct 18, 2019 · e68d290 · e68d290
1 parent 240dbae
commit e68d290
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 23 deletions.
diff --git a/src/controllers/controller.line.js b/src/controllers/controller.line.js
@@ -121,14 +121,12 @@ module.exports = DatasetController.extend({
 		var xScale = me._xScale;
 		var yScale = me._yScale;
 		var lineModel = meta.dataset._model;
-		var xvalue = me._getParsedValue(index, xScale);
-		var yvalue = me._getParsedValue(index, yScale);
 		var x, y;
 
 		var options = me._resolveDataElementOptions(point, index);
 
-		x = xScale.getPixelForValue(xvalue);
-		y = reset ? yScale.getBasePixel() : me.calculatePointY(yvalue, index, datasetIndex);
+		x = xScale.getPixelForValue(me._getParsedValue(index, xScale));
+		y = reset ? yScale.getBasePixel() : me.calculatePointY(me._getParsedValue(index, yScale), index, datasetIndex);
 
 		// Utility
 		point._xScale = xScale;

diff --git a/src/core/core.scale.js b/src/core/core.scale.js
@@ -928,6 +928,7 @@ var Scale = Element.extend({
 	},
 
 	/**
+	 * Returns visible dataset metas that are attached to this scale
 	 * @private
 	 */
 	_getMatchingMetas: function() {
@@ -976,19 +977,19 @@ var Scale = Element.extend({
 	 * @private
 	 */
 	_hasStacks: function(metas) {
-		var result = this.options.stacked;
+		var stacked = this.options.stacked;
 		var i, ilen;
 
-		metas = metas || this._getMatchingMetas();
-		if (result === undefined) {
-			for (i = 0, ilen = metas.length; i < ilen; ++i) {
-				if (metas[i].stack !== undefined) {
-					result = true;
-					break;
-				}
+		if (stacked !== undefined) {
+			return stacked;
+		}
+
+		for (i = 0, ilen = metas.length; i < ilen; ++i) {
+			if (metas[i].stack !== undefined) {
+				return true;
 			}
 		}
-		return result;
+		return false;
 	},
 
 	/**

diff --git a/src/scales/scale.logarithmic.js b/src/scales/scale.logarithmic.js
@@ -3,6 +3,7 @@
 var defaults = require('../core/core.defaults');
 var helpers = require('../helpers/index');
 var Scale = require('../core/core.scale');
+var LinearScaleBase = require('./scale.linearbase');
 var Ticks = require('../core/core.ticks');
 
 var valueOrDefault = helpers.valueOrDefault;
@@ -123,16 +124,7 @@ function updateLimits(scale, metas) {
 }
 
 module.exports = Scale.extend({
-	_parse: function(raw) {
-		if (helpers.isNullOrUndef(raw)) {
-			return NaN;
-		}
-		if ((typeof raw === 'number' || raw instanceof Number) && !isFinite(raw)) {
-			return NaN;
-		}
-
-		return +raw;
-	},
+	_parse: LinearScaleBase.prototype._parse,
 
 	determineDataLimits: function() {
 		var me = this;