From: Michaƫl Arnauts Date: Sat, 9 Jan 2016 11:04:29 +0000 (+0100) Subject: Ignore null values when calculating scale X-Git-Tag: v1.1.0~19^2 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=refs%2Fpull%2F1875%2Fhead;p=thirdparty%2FChart.js.git Ignore null values when calculating scale --- diff --git a/src/Chart.Core.js b/src/Chart.Core.js index 16f9d50d1..3a21f0abd 100755 --- a/src/Chart.Core.js +++ b/src/Chart.Core.js @@ -409,8 +409,13 @@ maxSteps = Math.floor(drawingSize/(textSize * 1.5)), skipFitting = (minSteps >= maxSteps); - var maxValue = max(valuesArray), - minValue = min(valuesArray); + // Filter out null values since these would min() to zero + var values = []; + each(valuesArray, function( v ){ + v == null || values.push( v ); + }); + var minValue = min(values), + maxValue = max(values); // We need some degree of separation here to calculate the scales if all the values are the same // Adding/minusing 0.5 will give us a range of 1.