From 243d96e85688006c7ad71080457e16f43d7d29f4 Mon Sep 17 00:00:00 2001 From: Dan Vanderkam Date: Sun, 29 Nov 2009 09:37:55 -0500 Subject: [PATCH] allow gaps in gviz data --- dygraph-combined.js | 46 ++++++++++++++++++++-------------------------- dygraph.js | 4 +--- 2 files changed, 21 insertions(+), 29 deletions(-) diff --git a/dygraph-combined.js b/dygraph-combined.js index a4adf08..0768e24 100644 --- a/dygraph-combined.js +++ b/dygraph-combined.js @@ -5810,17 +5810,11 @@ row.push(data.getValue(i,0).getTime()); }else{ row.push(data.getValue(i,0)); } -var _228=false; for(var j=1;j=0){ this.loadedEvent_(this.file_); }else{ var req=new XMLHttpRequest(); -var _230=this; +var _229=this; req.onreadystatechange=function(){ if(req.readyState==4){ if(req.status==200){ -_230.loadedEvent_(req.responseText); +_229.loadedEvent_(req.responseText); } } }; @@ -5858,39 +5852,39 @@ this.error("Unknown data format: "+(typeof this.file_)); } } }; -Dygraph.prototype.updateOptions=function(_231){ -if(_231.customBars){ -this.customBars_=_231.customBars; +Dygraph.prototype.updateOptions=function(_230){ +if(_230.customBars){ +this.customBars_=_230.customBars; } -if(_231.rollPeriod){ -this.rollPeriod_=_231.rollPeriod; +if(_230.rollPeriod){ +this.rollPeriod_=_230.rollPeriod; } -if(_231.dateWindow){ -this.dateWindow_=_231.dateWindow; +if(_230.dateWindow){ +this.dateWindow_=_230.dateWindow; } -if(_231.valueRange){ -this.valueRange_=_231.valueRange; +if(_230.valueRange){ +this.valueRange_=_230.valueRange; } -MochiKit.Base.update(this.user_attrs_,_231); +MochiKit.Base.update(this.user_attrs_,_230); this.labelsFromCSV_=(this.attr_("labels")==null); this.layout_.updateOptions({"errorBars":this.attr_("errorBars")}); -if(_231["file"]&&_231["file"]!=this.file_){ -this.file_=_231["file"]; +if(_230["file"]&&_230["file"]!=this.file_){ +this.file_=_230["file"]; this.start_(); }else{ this.drawGraph_(this.rawData_); } }; -Dygraph.prototype.adjustRoll=function(_232){ -this.rollPeriod_=_232; +Dygraph.prototype.adjustRoll=function(_231){ +this.rollPeriod_=_231; this.drawGraph_(this.rawData_); }; -Dygraph.GVizChart=function(_233){ -this.container=_233; +Dygraph.GVizChart=function(_232){ +this.container=_232; }; -Dygraph.GVizChart.prototype.draw=function(data,_234){ +Dygraph.GVizChart.prototype.draw=function(data,_233){ this.container.innerHTML=""; -this.date_graph=new Dygraph(this.container,data,_234); +this.date_graph=new Dygraph(this.container,data,_233); }; DateGraph=Dygraph; diff --git a/dygraph.js b/dygraph.js index 33f1e81..fd8a41d 100644 --- a/dygraph.js +++ b/dygraph.js @@ -1480,12 +1480,10 @@ Dygraph.prototype.parseDataTable_ = function(data) { } else { row.push(data.getValue(i, 0)); } - var any_data = false; for (var j = 1; j < cols; j++) { row.push(data.getValue(i, j)); - if (data.getValue(i, j)) any_data = true; } - if (any_data) ret.push(row); + ret.push(row); } return ret; } -- 2.7.4