From: eichsjul <julian.eichstaedt@ch.sauter-bc.com>
Date: Mon, 15 Apr 2013 11:25:10 +0000 (+0200)
Subject: BUGFIX: bugfix for issue #451 is now also working for bars
X-Git-Tag: v1.0.0~31^2~7
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=b0375a2834e4114df9274a61435a7f536e9dd6f3;p=dygraphs.git

BUGFIX: bugfix for issue #451 is now also working for bars
---

diff --git a/dygraph.js b/dygraph.js
index afa3fd0..defa173 100644
--- a/dygraph.js
+++ b/dygraph.js
@@ -2296,7 +2296,9 @@ Dygraph.prototype.gatherDatasets_ = function(rolledSeries, dateWindow) {
     // Prune down to the desired range, if necessary (for zooming)
     // Because there can be lines going to points outside of the visible area,
     // we actually prune to visible points, plus one on either side.
-    var bars = this.attr_("errorBars") || this.attr_("customBars");
+    var errorBars = this.attr_("errorBars");
+    var customBars = this.attr_("customBars");
+    var bars = errorBars || customBars;
     if (dateWindow) {
       var low = dateWindow[0];
       var high = dateWindow[1];
@@ -2314,17 +2316,37 @@ Dygraph.prototype.gatherDatasets_ = function(rolledSeries, dateWindow) {
       }
       if (firstIdx === null) firstIdx = 0;
       var correctedFirstIdx = firstIdx;
-      if (correctedFirstIdx > 0) correctedFirstIdx--;
-      while(series[correctedFirstIdx][1] === null && correctedFirstIdx > 0){
+   
+      var isInvalidValue = true;
+      while(isInvalidValue && correctedFirstIdx > 0){
         correctedFirstIdx--;
+        
+        if(bars){
+          if(customBars){
+            isInvalidValue = series[correctedFirstIdx][1][1] === null;
+          } else if(errorBars){
+            isInvalidValue = series[correctedFirstIdx][1][0] === null;
+          }
+        } else{
+          isInvalidValue = series[correctedFirstIdx][1] === null;
+        }
       }
       
-      
       if (lastIdx === null) lastIdx = series.length - 1;
       var correctedLastIdx = lastIdx;
-      if (correctedLastIdx < series.length - 1) correctedLastIdx++;
-      while(series[correctedLastIdx][1] === null && correctedLastIdx < series.length - 1){
+      isInvalidValue = true;
+      while(isInvalidValue && correctedLastIdx < series.length - 1){
         correctedLastIdx++;
+        
+        if(bars){
+          if(customBars){
+            isInvalidValue = series[correctedLastIdx][1][1] === null;
+          } else if(errorBars){
+            isInvalidValue = series[correctedLastIdx][1][0] === null;
+          }
+        } else{
+          isInvalidValue = series[correctedLastIdx][1] === null;
+        }
       }
       
       boundaryIds[i-1] = [(firstIdx > 0) ? firstIdx - 1 : firstIdx, (lastIdx < series.length - 1) ? lastIdx + 1 : lastIdx];