From 780e3b0db9e05e4c91f0cf329d4c4473a4676031 Mon Sep 17 00:00:00 2001 From: ovvn Date: Fri, 2 Mar 2018 12:47:59 +0300 Subject: [PATCH 1/2] [calcTicksY] Fix indentation. --- src/utils.js | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/utils.js b/src/utils.js index 5b256def3..f9369562a 100644 --- a/src/utils.js +++ b/src/utils.js @@ -453,30 +453,30 @@ nv.utils.calcTicksX = function(numTicks, data) { returns number of ticks to actually use on Y axis, based on chart data */ nv.utils.calcTicksY = function(numTicks, data, getY) { - if (getY) { - // find max number of values from all data streams - var numValues = 1; - for (var i=0; i < data.length; i += 1) { - var values = data[i] && data[i].values ? data[i].values : []; - var maxValue; - for (var j=0; j < values.length; j += 1) { - maxValue = values[j] && getY(values[j]) ? getY(values[j]): 0; - numValues = maxValue > numValues ? maxValue : numValues; - } + if (getY) { + // find max number of values from all data streams + var numValues = 1; + for (var i=0; i < data.length; i += 1) { + var values = data[i] && data[i].values ? data[i].values : []; + var maxValue; + for (var j=0; j < values.length; j += 1) { + maxValue = values[j] && getY(values[j]) ? getY(values[j]): 0; + numValues = maxValue > numValues ? maxValue : numValues; + } + } + nv.log("Requested number of ticks: ", numTicks); + nv.log("Calculated max values to be: ", numValues); + // make sure we don't have more ticks than values to avoid duplicates + numTicks = numTicks > numValues ? numValues - 1 : numTicks; + // make sure we have at least one tick + numTicks = numTicks < 1 ? 1 : numTicks; + // make sure it's an integer + numTicks = Math.floor(numTicks); + nv.log("Calculating tick count as: ", numTicks); + return numTicks; + } else { + return nv.utils.calcTicksX(numTicks, data); } - nv.log("Requested number of ticks: ", numTicks); - nv.log("Calculated max values to be: ", numValues); - // make sure we don't have more ticks than values to avoid duplicates - numTicks = numTicks > numValues ? numValues - 1 : numTicks; - // make sure we have at least one tick - numTicks = numTicks < 1 ? 1 : numTicks; - // make sure it's an integer - numTicks = Math.floor(numTicks); - nv.log("Calculating tick count as: ", numTicks); - return numTicks; - } else { - return nv.utils.calcTicksX(numTicks, data); - } }; From 47a3630c1d7086d21df6e250e98df675595628e6 Mon Sep 17 00:00:00 2001 From: ovvn Date: Fri, 2 Mar 2018 12:48:53 +0300 Subject: [PATCH 2/2] [calcTicksY] Remove outdated comment. --- src/utils.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/utils.js b/src/utils.js index f9369562a..4b36f801d 100644 --- a/src/utils.js +++ b/src/utils.js @@ -454,7 +454,6 @@ nv.utils.calcTicksX = function(numTicks, data) { */ nv.utils.calcTicksY = function(numTicks, data, getY) { if (getY) { - // find max number of values from all data streams var numValues = 1; for (var i=0; i < data.length; i += 1) { var values = data[i] && data[i].values ? data[i].values : [];