X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;ds=inline;f=dygraph.js;h=afa3fd01a8183b2e5f1a20fb1e46fb0a59356aa5;hb=14ac984ed878febd5e2831386b22c2548bfdb73b;hp=0dcc23af8959ef8164f03ee53ddd974e5d2c5f03;hpb=a535619ba714a2a84c8ef25fcef10393a0b47c05;p=dygraphs.git

diff --git a/dygraph.js b/dygraph.js
index 0dcc23a..afa3fd0 100644
--- a/dygraph.js
+++ b/dygraph.js
@@ -2313,13 +2313,30 @@ Dygraph.prototype.gatherDatasets_ = function(rolledSeries, dateWindow) {
         }
       }
       if (firstIdx === null) firstIdx = 0;
-      if (firstIdx > 0) firstIdx--;
+      var correctedFirstIdx = firstIdx;
+      if (correctedFirstIdx > 0) correctedFirstIdx--;
+      while(series[correctedFirstIdx][1] === null && correctedFirstIdx > 0){
+        correctedFirstIdx--;
+      }
+      
+      
       if (lastIdx === null) lastIdx = series.length - 1;
-      if (lastIdx < series.length - 1) lastIdx++;
-      boundaryIds[i-1] = [firstIdx, lastIdx];
+      var correctedLastIdx = lastIdx;
+      if (correctedLastIdx < series.length - 1) correctedLastIdx++;
+      while(series[correctedLastIdx][1] === null && correctedLastIdx < series.length - 1){
+        correctedLastIdx++;
+      }
+      
+      boundaryIds[i-1] = [(firstIdx > 0) ? firstIdx - 1 : firstIdx, (lastIdx < series.length - 1) ? lastIdx + 1 : lastIdx];
+      
+      if(correctedFirstIdx!==firstIdx)
+        pruned.push(series[correctedFirstIdx]);
       for (k = firstIdx; k <= lastIdx; k++) {
-        pruned.push(series[k]);
+          pruned.push(series[k]);
       }
+      if(correctedLastIdx !== lastIdx)
+        pruned.push(series[correctedLastIdx]);
+      
       series = pruned;
     } else {
       boundaryIds[i-1] = [0, series.length-1];