Merge pull request #2144 from dmapper/fix-y-axis-tick-number

Fix calcTicksY formatting
novus · Apr 6, 2018 · 254bb45 · 254bb45
2 parents 2c954c0 + 47a3630
commit 254bb45
Showing 1 changed file with 22 additions and 23 deletions.
diff --git a/src/utils.js b/src/utils.js
@@ -453,30 +453,29 @@ 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) {
+        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);
-  }
 };