From: Paul Felix Date: Mon, 26 Dec 2011 05:53:09 +0000 (-0500) Subject: Fix issue 246. X-Git-Tag: v1.0.0~387 X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=3810c27a7a6f3e3ac9532afa970ead0e8c7e555c;p=dygraphs.git Fix issue 246. See http://code.google.com/p/dygraphs/issues/detail?id=246. --- diff --git a/dygraph-range-selector.js b/dygraph-range-selector.js index 18eeee0..2c55194 100644 --- a/dygraph-range-selector.js +++ b/dygraph-range-selector.js @@ -466,17 +466,24 @@ DygraphRangeSelector.prototype.computeCombinedSeriesAndLimits_ = function() { var sum; var count; var yVal, y; - var mutipleValues = typeof data[0][1] != 'number'; + var mutipleValues; var i, j, k; - if (mutipleValues) { - sum = []; - count = []; - for (k = 0; k < data[0][1].length; k++) { - sum.push(0); - count.push(0); + // Find out if data has multiple values per datapoint. + // Go to first data point that actually has values (see http://code.google.com/p/dygraphs/issues/detail?id=246) + for (i = 0; i < data.length; i++) { + if (data[i].length > 1 && data[i][1] != null) { + mutipleValues = typeof data[i][1] != 'number'; + if (mutipleValues) { + sum = []; + count = []; + for (k = 0; k < data[0][1].length; k++) { + sum.push(0); + count.push(0); + } + } + break; } - mutipleValues = true; } for (i = 0; i < data.length; i++) {