X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-combined.js;h=fbc7c1d727875a10d95968998745edef07115c7a;hb=1bce597191839ef2e56ecba0bf7be1e60209a5c6;hp=61733c0095674776b8c31428903f0d56df07f391;hpb=681a238e1a94fc6e9f1d32558922a0fcefcad72c;p=dygraphs.git

diff --git a/dygraph-combined.js b/dygraph-combined.js
index 61733c0..fbc7c1d 100644
--- a/dygraph-combined.js
+++ b/dygraph-combined.js
@@ -19,6 +19,9 @@ this._evaluateLineTicks();
 DygraphLayout.prototype._evaluateLimits=function(){
 this.minxval=this.maxxval=null;
 for(var _6 in this.datasets){
+if(!this.datasets.hasOwnProperty(_6)){
+continue;
+}
 var _7=this.datasets[_6];
 var x1=_7[0][0];
 if(!this.minxval||x1<this.minxval){
@@ -39,6 +42,9 @@ this.yscale=(this.yrange!=0?1/this.yrange:1);
 DygraphLayout.prototype._evaluateLineCharts=function(){
 this.points=new Array();
 for(var _10 in this.datasets){
+if(!this.datasets.hasOwnProperty(_10)){
+continue;
+}
 var _11=this.datasets[_10];
 for(var j=0;j<_11.length;j++){
 var _13=_11[j];
@@ -82,6 +88,9 @@ return;
 }
 var i=0;
 for(var _19 in this.datasets){
+if(!this.datasets.hasOwnProperty(_19)){
+continue;
+}
 var j=0;
 var _20=this.datasets[_19];
 for(var j=0;j<_20.length;j++,i++){
@@ -214,8 +223,10 @@ var _41={"position":"absolute","fontSize":this.options.axisLabelFontSize+"px","z
 var _42=function(txt){
 var div=document.createElement("div");
 for(var _45 in _41){
+if(_41.hasOwnProperty(_45)){
 div.style[_45]=_41[_45];
 }
+}
 div.appendChild(document.createTextNode(txt));
 return div;
 };
@@ -312,8 +323,10 @@ var _55=this.options.colorScheme;
 var _56=this.layout.options.errorBars;
 var _57=[];
 for(var _58 in this.layout.datasets){
+if(this.layout.datasets.hasOwnProperty(_58)){
 _57.push(_58);
 }
+}
 var _59=_57.length;
 for(var i=0;i<this.layout.points.length;i++){
 var _60=this.layout.points[i];
@@ -470,9 +483,10 @@ this.attrs_={};
 Dygraph.update(this.attrs_,Dygraph.DEFAULT_ATTRS);
 this.labelsFromCSV_=(this.attr_("labels")==null);
 this.createInterface_();
-this.layoutOptions_={"errorBars":(this.attr_("errorBars")||this.attr_("customBars")),"xOriginIsZero":false};
+this.layoutOptions_={"xOriginIsZero":false};
 Dygraph.update(this.layoutOptions_,this.attrs_);
 Dygraph.update(this.layoutOptions_,this.user_attrs_);
+Dygraph.update(this.layoutOptions_,{"errorBars":(this.attr_("errorBars")||this.attr_("customBars"))});
 this.layout_=new DygraphLayout(this,this.layoutOptions_);
 this.renderOptions_={colorScheme:this.colors_,strokeColor:null,axisLineWidth:Dygraph.AXIS_LINE_WIDTH};
 Dygraph.update(this.renderOptions_,this.attrs_);
@@ -681,8 +695,10 @@ var _116={"position":"absolute","fontSize":"14px","zIndex":10,"width":_115+"px",
 Dygraph.update(_116,this.attr_("labelsDivStyles"));
 var div=document.createElement("div");
 for(var name in _116){
+if(_116.hasOwnProperty(name)){
 div.style[name]=_116[name];
 }
+}
 this.graphDiv.appendChild(div);
 this.attrs_.labelsDiv=div;
 }
@@ -695,8 +711,10 @@ _120.type="text";
 _120.size="2";
 _120.value=this.rollPeriod_;
 for(var name in _119){
+if(_119.hasOwnProperty(name)){
 _120.style[name]=_119[name];
 }
+}
 var pa=this.graphDiv;
 pa.appendChild(_120);
 var _122=this;
@@ -1297,17 +1315,21 @@ for(var i=0;i<_235.length;i++){
 var data=_235[i][1];
 var y=data[1];
 _237[i]=[_235[i][0],[y,y-data[0],data[2]-y]];
+if(y!=null&&!isNaN(y)){
 low+=data[0];
 mid+=y;
 high+=data[2];
 _246+=1;
+}
 if(i-_236>=0){
 var prev=_235[i-_236];
+if(prev[1][1]!=null&&!isNaN(prev[1][1])){
 low-=prev[1][0];
 mid-=prev[1][1];
 high-=prev[1][2];
 _246-=1;
 }
+}
 _237[i]=[_235[i][0],[1*mid/_246,1*(mid-low)/_246,1*(high-mid)/_246]];
 }
 }else{
@@ -1321,7 +1343,7 @@ var sum=0;
 var _250=0;
 for(var j=Math.max(0,i-_236+1);j<i+1;j++){
 var y=_235[j][1];
-if(!y||isNaN(y)){
+if(y==null||isNaN(y)){
 continue;
 }
 _250++;
@@ -1340,7 +1362,7 @@ var _251=0;
 var _250=0;
 for(var j=Math.max(0,i-_236+1);j<i+1;j++){
 var y=_235[j][1][0];
-if(!y||isNaN(y)){
+if(y==null||isNaN(y)){
 continue;
 }
 _250++;
@@ -1514,8 +1536,12 @@ var rows=data.getNumberOfRows();
 var _268=[];
 for(var i=0;i<cols;i++){
 _268.push(data.getColumnLabel(i));
+if(i!=0&&this.attr_("errorBars")){
+i+=1;
+}
 }
 this.attrs_.labels=_268;
+cols=_268.length;
 var _269=data.getColumnType(0);
 if(_269=="date"){
 this.attrs_.xValueFormatter=Dygraph.dateString_;
@@ -1546,9 +1572,15 @@ row.push(data.getValue(i,0).getTime());
 }else{
 row.push(data.getValue(i,0));
 }
+if(!this.attr_("errorBars")){
 for(var j=1;j<cols;j++){
 row.push(data.getValue(i,j));
 }
+}else{
+for(var j=0;j<cols-1;j++){
+row.push([data.getValue(i,1+2*j),data.getValue(i,2+2*j)]);
+}
+}
 ret.push(row);
 }
 return ret;
@@ -1556,9 +1588,11 @@ return ret;
 Dygraph.update=function(self,o){
 if(typeof (o)!="undefined"&&o!==null){
 for(var k in o){
+if(o.hasOwnProperty(k)){
 self[k]=o[k];
 }
 }
+}
 return self;
 };
 Dygraph.isArrayLike=function(o){