Addition to #5234, filter the array only if necessary.

We don't want to run the expensive filter operation unless the array actually contains invalid items.
highcharts · May 4, 2016 · a689771 · a689771
1 parent f42f8b6
commit a689771
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 14 deletions.
diff --git a/js/highcharts.src.js b/js/highcharts.src.js
@@ -2,7 +2,7 @@
 // @compilation_level SIMPLE_OPTIMIZATIONS
 
 /**
- * @license Highcharts JS v4.2.4-modified (2016-05-03)
+ * @license Highcharts JS v4.2.4-modified (2016-05-04)
  *
  * (c) 2009-2016 Torstein Honsi
  *
@@ -7356,14 +7356,20 @@
                     if (axis.isXAxis) {
                         xData = series.xData;
                         if (xData.length) {
-                            // If xData contains values which is not numbers, then filter them out
-                            if (!isNumber(xData)) {
+                            // If xData contains values which is not numbers, then filter them out.
+                            // To prevent performance hit, we only do this after we have already
+                            // found seriesDataMin because in most cases all data is valid. #5234.
+                            seriesDataMin = arrayMin(xData);
+                            if (!isNumber(seriesDataMin)) {
                                 xData = grep(xData, function (x) {
                                     return isNumber(x);
                                 });
+                                seriesDataMin = arrayMin(xData); // Do it again with valid data
                             }
-                            axis.dataMin = mathMin(pick(axis.dataMin, xData[0]), arrayMin(xData));
+
+                            axis.dataMin = mathMin(pick(axis.dataMin, xData[0]), seriesDataMin);
                             axis.dataMax = mathMax(pick(axis.dataMax, xData[0]), arrayMax(xData));
+
                         }
 
                     // Get dataMin and dataMax for Y axes, as well as handle stacking and processed data

diff --git a/js/highmaps.src.js b/js/highmaps.src.js
@@ -1,5 +1,5 @@
 /**
- * @license Highmaps JS v4.2.4-modified (2016-05-03)
+ * @license Highmaps JS v4.2.4-modified (2016-05-04)
  *
  * (c) 2011-2016 Torstein Honsi
  *
@@ -7082,14 +7082,20 @@
                     if (axis.isXAxis) {
                         xData = series.xData;
                         if (xData.length) {
-                            // If xData contains values which is not numbers, then filter them out
-                            if (!isNumber(xData)) {
+                            // If xData contains values which is not numbers, then filter them out.
+                            // To prevent performance hit, we only do this after we have already
+                            // found seriesDataMin because in most cases all data is valid. #5234.
+                            seriesDataMin = arrayMin(xData);
+                            if (!isNumber(seriesDataMin)) {
                                 xData = grep(xData, function (x) {
                                     return isNumber(x);
                                 });
+                                seriesDataMin = arrayMin(xData); // Do it again with valid data
                             }
-                            axis.dataMin = mathMin(pick(axis.dataMin, xData[0]), arrayMin(xData));
+
+                            axis.dataMin = mathMin(pick(axis.dataMin, xData[0]), seriesDataMin);
                             axis.dataMax = mathMax(pick(axis.dataMax, xData[0]), arrayMax(xData));
+
                         }
 
                     // Get dataMin and dataMax for Y axes, as well as handle stacking and processed data

diff --git a/js/highstock.src.js b/js/highstock.src.js
@@ -7356,14 +7356,20 @@
                     if (axis.isXAxis) {
                         xData = series.xData;
                         if (xData.length) {
-                            // If xData contains values which is not numbers, then filter them out
-                            if (!isNumber(xData)) {
+                            // If xData contains values which is not numbers, then filter them out.
+                            // To prevent performance hit, we only do this after we have already
+                            // found seriesDataMin because in most cases all data is valid. #5234.
+                            seriesDataMin = arrayMin(xData);
+                            if (!isNumber(seriesDataMin)) {
                                 xData = grep(xData, function (x) {
                                     return isNumber(x);
                                 });
+                                seriesDataMin = arrayMin(xData); // Do it again with valid data
                             }
-                            axis.dataMin = mathMin(pick(axis.dataMin, xData[0]), arrayMin(xData));
+
+                            axis.dataMin = mathMin(pick(axis.dataMin, xData[0]), seriesDataMin);
                             axis.dataMax = mathMax(pick(axis.dataMax, xData[0]), arrayMax(xData));
+
                         }
 
                     // Get dataMin and dataMax for Y axes, as well as handle stacking and processed data

diff --git a/js/parts/Axis.js b/js/parts/Axis.js
@@ -458,14 +458,20 @@ Axis.prototype = {
 				if (axis.isXAxis) {
 					xData = series.xData;
 					if (xData.length) {
-						// If xData contains values which is not numbers, then filter them out
-						if (!isNumber(xData)) {
+						// If xData contains values which is not numbers, then filter them out.
+						// To prevent performance hit, we only do this after we have already
+						// found seriesDataMin because in most cases all data is valid. #5234.
+						seriesDataMin = arrayMin(xData);
+						if (!isNumber(seriesDataMin)) {
 							xData = grep(xData, function (x) {
 								return isNumber(x);
 							});
+							seriesDataMin = arrayMin(xData); // Do it again with valid data
 						}
-						axis.dataMin = mathMin(pick(axis.dataMin, xData[0]), arrayMin(xData));
+
+						axis.dataMin = mathMin(pick(axis.dataMin, xData[0]), seriesDataMin);
 						axis.dataMax = mathMax(pick(axis.dataMax, xData[0]), arrayMax(xData));
+
 					}
 
 				// Get dataMin and dataMax for Y axes, as well as handle stacking and processed data