dependence on PlotKit.Canvas is severed
[dygraphs.git] / dygraph-combined.js
index 64357fe..59b1cf1 100644 (file)
@@ -3879,13 +3879,6 @@ throw "";
 catch(e){
 throw "PlotKit depends on MochiKit.{Base,Color,DOM}";
 }
-MochiKit.Base.update(MochiKit.Color.Color.prototype,{asFillColor:function(){
-return this.lighterColorWithLevel(0.3);
-},asStrokeColor:function(){
-return this.darkerColorWithLevel(0.1);
-},asPointColor:function(){
-return this.lighterColorWithLevel(0.1);
-}});
 if(typeof (PlotKit)=="undefined"){
 PlotKit={};
 }
@@ -4053,229 +4046,124 @@ this.EXPORT_TAGS={":common":this.EXPORT,":all":m.concat(this.EXPORT,this.EXPORT_
 };
 PlotKit.Base.__new__();
 MochiKit.Base._exportSymbols(this,PlotKit.Base);
-try{
-if(typeof (PlotKit.Base)=="undefined"){
-throw "";
-}
-}
-catch(e){
-throw "PlotKit.Layout depends on MochiKit.{Base,Color,DOM,Format} and PlotKit.Base";
-}
-if(typeof (PlotKit.Layout)=="undefined"){
-PlotKit.Layout={};
-}
-PlotKit.Layout.NAME="PlotKit.Layout";
-PlotKit.Layout.VERSION=PlotKit.VERSION;
-PlotKit.Layout.__repr__=function(){
-return "["+this.NAME+" "+this.VERSION+"]";
-};
-PlotKit.Layout.toString=function(){
-return this.__repr__();
-};
-PlotKit.Layout.valid_styles=["bar","line","pie","point"];
-PlotKit.Layout=function(_28,_29){
-this.options={"barWidthFillFraction":0.75,"barOrientation":"vertical","xOriginIsZero":true,"yOriginIsZero":true,"xAxis":null,"yAxis":null,"xTicks":null,"yTicks":null,"xNumberOfTicks":10,"yNumberOfTicks":5,"xTickPrecision":1,"yTickPrecision":1,"pieRadius":0.4};
-this.style=_28;
-MochiKit.Base.update(this.options,_29?_29:{});
-if(!MochiKit.Base.isUndefinedOrNull(this.options.xAxis)){
-this.minxval=this.options.xAxis[0];
-this.maxxval=this.options.xAxis[1];
-this.xscale=this.maxxval-this.minxval;
-}else{
-this.minxval=0;
-this.maxxval=null;
-this.xscale=null;
-}
-if(!MochiKit.Base.isUndefinedOrNull(this.options.yAxis)){
-this.minyval=this.options.yAxis[0];
-this.maxyval=this.options.yAxis[1];
-this.yscale=this.maxyval-this.minyval;
-}else{
-this.minyval=0;
-this.maxyval=null;
-this.yscale=null;
-}
-this.bars=new Array();
-this.points=new Array();
-this.slices=new Array();
-this.xticks=new Array();
-this.yticks=new Array();
+
+
+Date.ext={};Date.ext.util={};Date.ext.util.xPad=function(x,pad,r){if(typeof (r)=="undefined"){r=10}for(;parseInt(x,10)<r&&r>1;r/=10){x=pad.toString()+x}return x.toString()};Date.prototype.locale="en-GB";if(document.getElementsByTagName("html")&&document.getElementsByTagName("html")[0].lang){Date.prototype.locale=document.getElementsByTagName("html")[0].lang}Date.ext.locales={};Date.ext.locales.en={a:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],A:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],b:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],B:["January","February","March","April","May","June","July","August","September","October","November","December"],c:"%a %d %b %Y %T %Z",p:["AM","PM"],P:["am","pm"],x:"%d/%m/%y",X:"%T"};Date.ext.locales["en-US"]=Date.ext.locales.en;Date.ext.locales["en-US"].c="%a %d %b %Y %r %Z";Date.ext.locales["en-US"].x="%D";Date.ext.locales["en-US"].X="%r";Date.ext.locales["en-GB"]=Date.ext.locales.en;Date.ext.locales["en-AU"]=Date.ext.locales["en-GB"];Date.ext.formats={a:function(d){return Date.ext.locales[d.locale].a[d.getDay()]},A:function(d){return Date.ext.locales[d.locale].A[d.getDay()]},b:function(d){return Date.ext.locales[d.locale].b[d.getMonth()]},B:function(d){return Date.ext.locales[d.locale].B[d.getMonth()]},c:"toLocaleString",C:function(d){return Date.ext.util.xPad(parseInt(d.getFullYear()/100,10),0)},d:["getDate","0"],e:["getDate"," "],g:function(d){return Date.ext.util.xPad(parseInt(Date.ext.util.G(d)/100,10),0)},G:function(d){var y=d.getFullYear();var V=parseInt(Date.ext.formats.V(d),10);var W=parseInt(Date.ext.formats.W(d),10);if(W>V){y++}else{if(W===0&&V>=52){y--}}return y},H:["getHours","0"],I:function(d){var I=d.getHours()%12;return Date.ext.util.xPad(I===0?12:I,0)},j:function(d){var ms=d-new Date(""+d.getFullYear()+"/1/1 GMT");ms+=d.getTimezoneOffset()*60000;var doy=parseInt(ms/60000/60/24,10)+1;return Date.ext.util.xPad(doy,0,100)},m:function(d){return Date.ext.util.xPad(d.getMonth()+1,0)},M:["getMinutes","0"],p:function(d){return Date.ext.locales[d.locale].p[d.getHours()>=12?1:0]},P:function(d){return Date.ext.locales[d.locale].P[d.getHours()>=12?1:0]},S:["getSeconds","0"],u:function(d){var dow=d.getDay();return dow===0?7:dow},U:function(d){var doy=parseInt(Date.ext.formats.j(d),10);var rdow=6-d.getDay();var woy=parseInt((doy+rdow)/7,10);return Date.ext.util.xPad(woy,0)},V:function(d){var woy=parseInt(Date.ext.formats.W(d),10);var dow1_1=(new Date(""+d.getFullYear()+"/1/1")).getDay();var idow=woy+(dow1_1>4||dow1_1<=1?0:1);if(idow==53&&(new Date(""+d.getFullYear()+"/12/31")).getDay()<4){idow=1}else{if(idow===0){idow=Date.ext.formats.V(new Date(""+(d.getFullYear()-1)+"/12/31"))}}return Date.ext.util.xPad(idow,0)},w:"getDay",W:function(d){var doy=parseInt(Date.ext.formats.j(d),10);var rdow=7-Date.ext.formats.u(d);var woy=parseInt((doy+rdow)/7,10);return Date.ext.util.xPad(woy,0,10)},y:function(d){return Date.ext.util.xPad(d.getFullYear()%100,0)},Y:"getFullYear",z:function(d){var o=d.getTimezoneOffset();var H=Date.ext.util.xPad(parseInt(Math.abs(o/60),10),0);var M=Date.ext.util.xPad(o%60,0);return(o>0?"-":"+")+H+M},Z:function(d){return d.toString().replace(/^.*\(([^)]+)\)$/,"$1")},"%":function(d){return"%"}};Date.ext.aggregates={c:"locale",D:"%m/%d/%y",h:"%b",n:"\n",r:"%I:%M:%S %p",R:"%H:%M",t:"\t",T:"%H:%M:%S",x:"locale",X:"locale"};Date.ext.aggregates.z=Date.ext.formats.z(new Date());Date.ext.aggregates.Z=Date.ext.formats.Z(new Date());Date.ext.unsupported={};Date.prototype.strftime=function(fmt){if(!(this.locale in Date.ext.locales)){if(this.locale.replace(/-[a-zA-Z]+$/,"") in Date.ext.locales){this.locale=this.locale.replace(/-[a-zA-Z]+$/,"")}else{this.locale="en-GB"}}var d=this;while(fmt.match(/%[cDhnrRtTxXzZ]/)){fmt=fmt.replace(/%([cDhnrRtTxXzZ])/g,function(m0,m1){var f=Date.ext.aggregates[m1];return(f=="locale"?Date.ext.locales[d.locale][m1]:f)})}var str=fmt.replace(/%([aAbBCdegGHIjmMpPSuUVwWyY%])/g,function(m0,m1){var f=Date.ext.formats[m1];if(typeof (f)=="string"){return d[f]()}else{if(typeof (f)=="function"){return f.call(d,d)}else{if(typeof (f)=="object"&&typeof (f[0])=="string"){return Date.ext.util.xPad(d[f[0]](),f[1])}else{return m1}}}});d=null;return str};
+DygraphLayout=function(_1,_2){
+this.dygraph_=_1;
+this.options={};
+MochiKit.Base.update(this.options,_2?_2:{});
 this.datasets=new Array();
-this.minxdelta=0;
-this.xrange=1;
-this.yrange=1;
-this.hitTestCache={x2maxy:null};
 };
-PlotKit.Layout.prototype.addDataset=function(_30,_31){
-this.datasets[_30]=_31;
+DygraphLayout.prototype.attr_=function(_3){
+return this.dygraph_.attr_(_3);
 };
-PlotKit.Layout.prototype.removeDataset=function(_32,_33){
-delete this.datasets[_32];
+DygraphLayout.prototype.addDataset=function(_4,_5){
+this.datasets[_4]=_5;
 };
-PlotKit.Layout.prototype.evaluate=function(){
+DygraphLayout.prototype.evaluate=function(){
 this._evaluateLimits();
-this._evaluateScales();
-if(this.style=="line"){
 this._evaluateLineCharts();
 this._evaluateLineTicks();
-}
 };
-PlotKit.Layout.prototype._evaluateLimits=function(){
-var map=PlotKit.Base.map;
-var _35=PlotKit.Base.items;
-var _36=MochiKit.Base.itemgetter;
-var _37=PlotKit.Base.collapse;
-var _38=MochiKit.Base.listMin;
-var _39=MochiKit.Base.listMax;
-var _40=MochiKit.Base.isUndefinedOrNull;
-var all=_37(map(_36(1),_35(this.datasets)));
-if(_40(this.options.xAxis)){
-if(this.options.xOriginIsZero){
-this.minxval=0;
-}else{
-this.minxval=_38(map(parseFloat,map(_36(0),all)));
+DygraphLayout.prototype._evaluateLimits=function(){
+this.minxval=this.maxxval=null;
+for(var _6 in this.datasets){
+var _7=this.datasets[_6];
+var x1=_7[0][0];
+if(!this.minxval||x1<this.minxval){
+this.minxval=x1;
 }
-this.maxxval=_39(map(parseFloat,map(_36(0),all)));
-}else{
-this.minxval=this.options.xAxis[0];
-this.maxxval=this.options.xAxis[1];
-this.xscale=this.maxval-this.minxval;
+var x2=_7[_7.length-1][0];
+if(!this.maxxval||x2>this.maxxval){
+this.maxxval=x2;
 }
-if(_40(this.options.yAxis)){
-if(this.options.yOriginIsZero){
-this.minyval=0;
-}else{
-this.minyval=_38(map(parseFloat,map(_36(1),all)));
 }
-this.maxyval=_39(map(parseFloat,map(_36(1),all)));
-}else{
+this.xrange=this.maxxval-this.minxval;
+this.xscale=(this.xrange!=0?1/this.xrange:1);
 this.minyval=this.options.yAxis[0];
 this.maxyval=this.options.yAxis[1];
-this.yscale=this.maxyval-this.minyval;
-}
-};
-PlotKit.Layout.prototype._evaluateScales=function(){
-this.xrange=this.maxxval-this.minxval;
-if(this.xrange==0){
-this.xscale=1;
-}else{
-this.xscale=1/this.xrange;
-}
 this.yrange=this.maxyval-this.minyval;
-if(this.yrange==0){
-this.yscale=1;
-}else{
-this.yscale=1/this.yrange;
-}
+this.yscale=(this.yrange!=0?1/this.yrange:1);
 };
-PlotKit.Layout.prototype._evaluateLineCharts=function(){
-var _42=PlotKit.Base.items;
-var _43=_42(this.datasets).length;
+DygraphLayout.prototype._evaluateLineCharts=function(){
 this.points=new Array();
-var i=0;
-for(var _44 in this.datasets){
-var _45=this.datasets[_44];
-if(PlotKit.Base.isFuncLike(_45)){
-continue;
+for(var _10 in this.datasets){
+var _11=this.datasets[_10];
+for(var j=0;j<_11.length;j++){
+var _13=_11[j];
+var _14={x:((parseFloat(_13[0])-this.minxval)*this.xscale),y:1-((parseFloat(_13[1])-this.minyval)*this.yscale),xval:parseFloat(_13[0]),yval:parseFloat(_13[1]),name:_10};
+if(_14.y<=0){
+_14.y=0;
 }
-_45.sort(function(a,b){
-return compare(parseFloat(a[0]),parseFloat(b[0]));
-});
-for(var j=0;j<_45.length;j++){
-var _49=_45[j];
-var _50={x:((parseFloat(_49[0])-this.minxval)*this.xscale),y:1-((parseFloat(_49[1])-this.minyval)*this.yscale),xval:parseFloat(_49[0]),yval:parseFloat(_49[1]),name:_44};
-if(_50.y<=0){
-_50.y=0;
+if(_14.y>=1){
+_14.y=1;
 }
-if(_50.y>=1){
-_50.y=1;
+if((_14.x>=0)&&(_14.x<=1)){
+this.points.push(_14);
 }
-if((_50.x>=0)&&(_50.x<=1)){
-this.points.push(_50);
 }
 }
-i++;
-}
 };
-PlotKit.Layout.prototype._evaluateLineTicksForXAxis=function(){
-var _51=MochiKit.Base.isUndefinedOrNull;
+DygraphLayout.prototype._evaluateLineTicks=function(){
 this.xticks=new Array();
-var _52=function(_53){
-var _54=_53.label;
-if(_51(_54)){
-_54=_53.v.toString();
-}
-var pos=this.xscale*(_53.v-this.minxval);
+for(var i=0;i<this.options.xTicks.length;i++){
+var _16=this.options.xTicks[i];
+var _17=_16.label;
+var pos=this.xscale*(_16.v-this.minxval);
 if((pos>=0)&&(pos<=1)){
-this.xticks.push([pos,_54]);
+this.xticks.push([pos,_17]);
 }
-};
-MochiKit.Iter.forEach(this.options.xTicks,bind(_52,this));
-};
-PlotKit.Layout.prototype._evaluateLineTicksForYAxis=function(){
-var _56=MochiKit.Base.isUndefinedOrNull;
-this.yticks=new Array();
-var _57=function(_58){
-var _59=_58.label;
-if(_56(_59)){
-_59=_58.v.toString();
 }
-var pos=1-(this.yscale*(_58.v-this.minyval));
+this.yticks=new Array();
+for(var i=0;i<this.options.yTicks.length;i++){
+var _16=this.options.yTicks[i];
+var _17=_16.label;
+var pos=1-(this.yscale*(_16.v-this.minyval));
 if((pos>=0)&&(pos<=1)){
-this.yticks.push([pos,_59]);
+this.yticks.push([pos,_17]);
+}
 }
 };
-MochiKit.Iter.forEach(this.options.yTicks,bind(_57,this));
-};
-PlotKit.Layout.prototype._evaluateLineTicks=function(){
-this._evaluateLineTicksForXAxis();
-this._evaluateLineTicksForYAxis();
-};
-PlotKit.LayoutModule={};
-PlotKit.LayoutModule.Layout=PlotKit.Layout;
-PlotKit.LayoutModule.EXPORT=["Layout"];
-PlotKit.LayoutModule.EXPORT_OK=[];
-PlotKit.LayoutModule.__new__=function(){
-var m=MochiKit.Base;
-m.nameFunctions(this);
-this.EXPORT_TAGS={":common":this.EXPORT,":all":m.concat(this.EXPORT,this.EXPORT_OK)};
-};
-PlotKit.LayoutModule.__new__();
-MochiKit.Base._exportSymbols(this,PlotKit.LayoutModule);
-try{
-if((typeof (PlotKit.Base)=="undefined")||(typeof (PlotKit.Layout)=="undefined")){
-throw "";
+DygraphLayout.prototype.evaluateWithError=function(){
+this.evaluate();
+if(!this.options.errorBars){
+return;
 }
+var i=0;
+for(var _19 in this.datasets){
+var j=0;
+var _20=this.datasets[_19];
+if(PlotKit.Base.isFuncLike(_20)){
+continue;
+}
+for(var j=0;j<_20.length;j++,i++){
+var _21=_20[j];
+var xv=parseFloat(_21[0]);
+var yv=parseFloat(_21[1]);
+if(xv==this.points[i].xval&&yv==this.points[i].yval){
+this.points[i].errorMinus=parseFloat(_21[2]);
+this.points[i].errorPlus=parseFloat(_21[3]);
 }
-catch(e){
-throw "PlotKit.Layout depends on MochiKit.{Base,Color,DOM,Format} and PlotKit.{Base,Layout}";
 }
-if(typeof (PlotKit.CanvasRenderer)=="undefined"){
-PlotKit.CanvasRenderer={};
 }
-PlotKit.CanvasRenderer.NAME="PlotKit.CanvasRenderer";
-PlotKit.CanvasRenderer.VERSION=PlotKit.VERSION;
-PlotKit.CanvasRenderer.__repr__=function(){
-return "["+this.NAME+" "+this.VERSION+"]";
 };
-PlotKit.CanvasRenderer.toString=function(){
-return this.__repr__();
+DygraphLayout.prototype.removeAllDatasets=function(){
+delete this.datasets;
+this.datasets=new Array();
 };
-PlotKit.CanvasRenderer=function(_60,_61,_62){
-if(arguments.length>0){
-this.__init__(_60,_61,_62);
-}
+DygraphLayout.prototype.updateOptions=function(_24){
+MochiKit.Base.update(this.options,_24?_24:{});
 };
-PlotKit.CanvasRenderer.prototype.__init__=function(_63,_64,_65){
-var _66=MochiKit.Base.isUndefinedOrNull;
-var _67=MochiKit.Color.Color;
-this.options={"drawBackground":true,"backgroundColor":_67.whiteColor(),"colorScheme":PlotKit.Base.palette(PlotKit.Base.baseColors()[0]),"strokeColor":_67.whiteColor(),"strokeColorTransform":"asStrokeColor","strokeWidth":0.5,"shouldFill":true,"shouldStroke":true,"drawXAxis":true,"drawYAxis":true,"axisLineColor":_67.blackColor(),"axisLineWidth":0.5,"axisTickSize":3,"axisLabelColor":_67.blackColor(),"axisLabelFont":"Arial","axisLabelFontSize":9,"axisLabelWidth":50,"pieRadius":0.4,"enableEvents":true};
-MochiKit.Base.update(this.options,_65?_65:{});
-this.layout=_64;
-this.element=MochiKit.DOM.getElement(_63);
+DygraphCanvasRenderer=function(_25,_26,_27,_28){
+this.dygraph_=_25;
+this.options={"strokeWidth":0.5,"drawXAxis":true,"drawYAxis":true,"axisLineColor":Color.blackColor(),"axisLineWidth":0.5,"axisTickSize":3,"axisLabelColor":Color.blackColor(),"axisLabelFont":"Arial","axisLabelFontSize":9,"axisLabelWidth":50,"drawYGrid":true,"drawXGrid":true,"gridLineColor":MochiKit.Color.Color.grayColor()};
+MochiKit.Base.update(this.options,_28);
+this.layout=_27;
+this.element=MochiKit.DOM.getElement(_26);
 this.container=this.element.parentNode;
 this.isIE=PlotKit.Base.excanvasSupported();
-if(this.isIE&&!_66(G_vmlCanvasManager)){
+if(this.isIE&&!isNil(G_vmlCanvasManager)){
 this.IEDelay=0.5;
 this.maxTries=5;
 this.renderDelay=null;
@@ -4284,230 +4172,68 @@ this.element=G_vmlCanvasManager.initElement(this.element);
 }
 this.height=this.element.height;
 this.width=this.element.width;
-if(_66(this.element)){
-throw "CanvasRenderer() - passed canvas is not found";
-}
-if(!this.isIE&&!(PlotKit.CanvasRenderer.isSupported(this.element))){
-throw "CanvasRenderer() - Canvas is not supported.";
-}
-if(_66(this.container)||(this.container.nodeName.toLowerCase()!="div")){
-throw "CanvasRenderer() - <canvas> needs to be enclosed in <div>";
+if(!this.isIE&&!(DygraphCanvasRenderer.isSupported(this.element))){
+throw "Canvas is not supported.";
 }
 this.xlabels=new Array();
 this.ylabels=new Array();
-this.isFirstRender=true;
 this.area={x:this.options.yAxisLabelWidth+2*this.options.axisTickSize,y:0};
 this.area.w=this.width-this.area.x-this.options.rightGap;
 this.area.h=this.height-this.options.axisLabelFontSize-2*this.options.axisTickSize;
 MochiKit.DOM.updateNodeAttributes(this.container,{"style":{"position":"relative","width":this.width+"px"}});
 };
-PlotKit.CanvasRenderer.prototype._renderLineAxis=function(){
-this._renderAxis();
-};
-PlotKit.CanvasRenderer.prototype._renderAxis=function(){
-if(!this.options.drawXAxis&&!this.options.drawYAxis){
-return;
-}
-var _68=this.element.getContext("2d");
-var _69={"style":{"position":"absolute","fontSize":this.options.axisLabelFontSize+"px","zIndex":10,"color":this.options.axisLabelColor.toRGBString(),"width":this.options.axisLabelWidth+"px","overflow":"hidden"}};
-_68.save();
-_68.strokeStyle=this.options.axisLineColor.toRGBString();
-_68.lineWidth=this.options.axisLineWidth;
-if(this.options.drawYAxis){
-if(this.layout.yticks){
-var _70=function(_71){
-if(typeof (_71)=="function"){
-return;
-}
-var x=this.area.x;
-var y=this.area.y+_71[0]*this.area.h;
-_68.beginPath();
-_68.moveTo(x,y);
-_68.lineTo(x-this.options.axisTickSize,y);
-_68.closePath();
-_68.stroke();
-var _73=DIV(_69,_71[1]);
-var top=(y-this.options.axisLabelFontSize/2);
-if(top<0){
-top=0;
-}
-if(top+this.options.axisLabelFontSize+3>this.height){
-_73.style.bottom="0px";
-}else{
-_73.style.top=top+"px";
-}
-_73.style.left="0px";
-_73.style.textAlign="right";
-_73.style.width=this.options.yAxisLabelWidth+"px";
-MochiKit.DOM.appendChildNodes(this.container,_73);
-this.ylabels.push(_73);
-};
-MochiKit.Iter.forEach(this.layout.yticks,bind(_70,this));
-var _75=this.ylabels[0];
-var _76=this.options.axisLabelFontSize;
-var _77=parseInt(_75.style.top)+_76;
-if(_77>this.height-_76){
-_75.style.top=(parseInt(_75.style.top)-_76/2)+"px";
-}
-}
-_68.beginPath();
-_68.moveTo(this.area.x,this.area.y);
-_68.lineTo(this.area.x,this.area.y+this.area.h);
-_68.closePath();
-_68.stroke();
-}
-if(this.options.drawXAxis){
-if(this.layout.xticks){
-var _70=function(_78){
-if(typeof (dataset)=="function"){
-return;
-}
-var x=this.area.x+_78[0]*this.area.w;
-var y=this.area.y+this.area.h;
-_68.beginPath();
-_68.moveTo(x,y);
-_68.lineTo(x,y+this.options.axisTickSize);
-_68.closePath();
-_68.stroke();
-var _79=DIV(_69,_78[1]);
-_79.style.textAlign="center";
-_79.style.bottom="0px";
-var _80=(x-this.options.axisLabelWidth/2);
-if(_80+this.options.axisLabelWidth>this.width){
-_80=this.width-this.options.xAxisLabelWidth;
-_79.style.textAlign="right";
-}
-if(_80<0){
-_80=0;
-_79.style.textAlign="left";
-}
-_79.style.left=_80+"px";
-_79.style.width=this.options.xAxisLabelWidth+"px";
-MochiKit.DOM.appendChildNodes(this.container,_79);
-this.xlabels.push(_79);
-};
-MochiKit.Iter.forEach(this.layout.xticks,bind(_70,this));
-}
-_68.beginPath();
-_68.moveTo(this.area.x,this.area.y+this.area.h);
-_68.lineTo(this.area.x+this.area.w,this.area.y+this.area.h);
-_68.closePath();
-_68.stroke();
-}
-_68.restore();
-};
-PlotKit.CanvasRenderer.prototype.clear=function(){
+DygraphCanvasRenderer.prototype.clear=function(){
 if(this.isIE){
 try{
 if(this.clearDelay){
 this.clearDelay.cancel();
 this.clearDelay=null;
 }
-var _81=this.element.getContext("2d");
+var _29=this.element.getContext("2d");
 }
 catch(e){
-this.isFirstRender=false;
 this.clearDelay=MochiKit.Async.wait(this.IEDelay);
 this.clearDelay.addCallback(bind(this.clear,this));
 return;
 }
 }
-var _81=this.element.getContext("2d");
-_81.clearRect(0,0,this.width,this.height);
+var _29=this.element.getContext("2d");
+_29.clearRect(0,0,this.width,this.height);
 MochiKit.Iter.forEach(this.xlabels,MochiKit.DOM.removeElement);
 MochiKit.Iter.forEach(this.ylabels,MochiKit.DOM.removeElement);
 this.xlabels=new Array();
 this.ylabels=new Array();
 };
-PlotKit.CanvasRenderer.isSupported=function(_82){
-var _83=null;
+DygraphCanvasRenderer.isSupported=function(_30){
+var _31=null;
 try{
-if(MochiKit.Base.isUndefinedOrNull(_82)){
-_83=MochiKit.DOM.CANVAS({});
+if(MochiKit.Base.isUndefinedOrNull(_30)){
+_31=MochiKit.DOM.CANVAS({});
 }else{
-_83=MochiKit.DOM.getElement(_82);
+_31=MochiKit.DOM.getElement(_30);
 }
-var _84=_83.getContext("2d");
+var _32=_31.getContext("2d");
 }
 catch(e){
 var ie=navigator.appVersion.match(/MSIE (\d\.\d)/);
-var _86=(navigator.userAgent.toLowerCase().indexOf("opera")!=-1);
-if((!ie)||(ie[1]<6)||(_86)){
+var _34=(navigator.userAgent.toLowerCase().indexOf("opera")!=-1);
+if((!ie)||(ie[1]<6)||(_34)){
 return false;
 }
 return true;
 }
 return true;
 };
-PlotKit.Canvas={};
-PlotKit.Canvas.CanvasRenderer=PlotKit.CanvasRenderer;
-PlotKit.Canvas.EXPORT=["CanvasRenderer"];
-PlotKit.Canvas.EXPORT_OK=["CanvasRenderer"];
-PlotKit.Canvas.__new__=function(){
-var m=MochiKit.Base;
-m.nameFunctions(this);
-this.EXPORT_TAGS={":common":this.EXPORT,":all":m.concat(this.EXPORT,this.EXPORT_OK)};
-};
-PlotKit.Canvas.__new__();
-MochiKit.Base._exportSymbols(this,PlotKit.Canvas);
-
-
-Date.ext={};Date.ext.util={};Date.ext.util.xPad=function(x,pad,r){if(typeof (r)=="undefined"){r=10}for(;parseInt(x,10)<r&&r>1;r/=10){x=pad.toString()+x}return x.toString()};Date.prototype.locale="en-GB";if(document.getElementsByTagName("html")&&document.getElementsByTagName("html")[0].lang){Date.prototype.locale=document.getElementsByTagName("html")[0].lang}Date.ext.locales={};Date.ext.locales.en={a:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],A:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],b:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],B:["January","February","March","April","May","June","July","August","September","October","November","December"],c:"%a %d %b %Y %T %Z",p:["AM","PM"],P:["am","pm"],x:"%d/%m/%y",X:"%T"};Date.ext.locales["en-US"]=Date.ext.locales.en;Date.ext.locales["en-US"].c="%a %d %b %Y %r %Z";Date.ext.locales["en-US"].x="%D";Date.ext.locales["en-US"].X="%r";Date.ext.locales["en-GB"]=Date.ext.locales.en;Date.ext.locales["en-AU"]=Date.ext.locales["en-GB"];Date.ext.formats={a:function(d){return Date.ext.locales[d.locale].a[d.getDay()]},A:function(d){return Date.ext.locales[d.locale].A[d.getDay()]},b:function(d){return Date.ext.locales[d.locale].b[d.getMonth()]},B:function(d){return Date.ext.locales[d.locale].B[d.getMonth()]},c:"toLocaleString",C:function(d){return Date.ext.util.xPad(parseInt(d.getFullYear()/100,10),0)},d:["getDate","0"],e:["getDate"," "],g:function(d){return Date.ext.util.xPad(parseInt(Date.ext.util.G(d)/100,10),0)},G:function(d){var y=d.getFullYear();var V=parseInt(Date.ext.formats.V(d),10);var W=parseInt(Date.ext.formats.W(d),10);if(W>V){y++}else{if(W===0&&V>=52){y--}}return y},H:["getHours","0"],I:function(d){var I=d.getHours()%12;return Date.ext.util.xPad(I===0?12:I,0)},j:function(d){var ms=d-new Date(""+d.getFullYear()+"/1/1 GMT");ms+=d.getTimezoneOffset()*60000;var doy=parseInt(ms/60000/60/24,10)+1;return Date.ext.util.xPad(doy,0,100)},m:function(d){return Date.ext.util.xPad(d.getMonth()+1,0)},M:["getMinutes","0"],p:function(d){return Date.ext.locales[d.locale].p[d.getHours()>=12?1:0]},P:function(d){return Date.ext.locales[d.locale].P[d.getHours()>=12?1:0]},S:["getSeconds","0"],u:function(d){var dow=d.getDay();return dow===0?7:dow},U:function(d){var doy=parseInt(Date.ext.formats.j(d),10);var rdow=6-d.getDay();var woy=parseInt((doy+rdow)/7,10);return Date.ext.util.xPad(woy,0)},V:function(d){var woy=parseInt(Date.ext.formats.W(d),10);var dow1_1=(new Date(""+d.getFullYear()+"/1/1")).getDay();var idow=woy+(dow1_1>4||dow1_1<=1?0:1);if(idow==53&&(new Date(""+d.getFullYear()+"/12/31")).getDay()<4){idow=1}else{if(idow===0){idow=Date.ext.formats.V(new Date(""+(d.getFullYear()-1)+"/12/31"))}}return Date.ext.util.xPad(idow,0)},w:"getDay",W:function(d){var doy=parseInt(Date.ext.formats.j(d),10);var rdow=7-Date.ext.formats.u(d);var woy=parseInt((doy+rdow)/7,10);return Date.ext.util.xPad(woy,0,10)},y:function(d){return Date.ext.util.xPad(d.getFullYear()%100,0)},Y:"getFullYear",z:function(d){var o=d.getTimezoneOffset();var H=Date.ext.util.xPad(parseInt(Math.abs(o/60),10),0);var M=Date.ext.util.xPad(o%60,0);return(o>0?"-":"+")+H+M},Z:function(d){return d.toString().replace(/^.*\(([^)]+)\)$/,"$1")},"%":function(d){return"%"}};Date.ext.aggregates={c:"locale",D:"%m/%d/%y",h:"%b",n:"\n",r:"%I:%M:%S %p",R:"%H:%M",t:"\t",T:"%H:%M:%S",x:"locale",X:"locale"};Date.ext.aggregates.z=Date.ext.formats.z(new Date());Date.ext.aggregates.Z=Date.ext.formats.Z(new Date());Date.ext.unsupported={};Date.prototype.strftime=function(fmt){if(!(this.locale in Date.ext.locales)){if(this.locale.replace(/-[a-zA-Z]+$/,"") in Date.ext.locales){this.locale=this.locale.replace(/-[a-zA-Z]+$/,"")}else{this.locale="en-GB"}}var d=this;while(fmt.match(/%[cDhnrRtTxXzZ]/)){fmt=fmt.replace(/%([cDhnrRtTxXzZ])/g,function(m0,m1){var f=Date.ext.aggregates[m1];return(f=="locale"?Date.ext.locales[d.locale][m1]:f)})}var str=fmt.replace(/%([aAbBCdegGHIjmMpPSuUVwWyY%])/g,function(m0,m1){var f=Date.ext.formats[m1];if(typeof (f)=="string"){return d[f]()}else{if(typeof (f)=="function"){return f.call(d,d)}else{if(typeof (f)=="object"&&typeof (f[0])=="string"){return Date.ext.util.xPad(d[f[0]](),f[1])}else{return m1}}}});d=null;return str};
-DygraphLayout=function(_1){
-PlotKit.Layout.call(this,"line",_1);
-};
-DygraphLayout.prototype=new PlotKit.Layout();
-DygraphLayout.prototype.evaluateWithError=function(){
-this.evaluate();
-if(!this.options.errorBars){
-return;
-}
-var i=0;
-for(var _3 in this.datasets){
-var j=0;
-var _5=this.datasets[_3];
-if(PlotKit.Base.isFuncLike(_5)){
-continue;
-}
-for(var j=0;j<_5.length;j++,i++){
-var _6=_5[j];
-var xv=parseFloat(_6[0]);
-var yv=parseFloat(_6[1]);
-if(xv==this.points[i].xval&&yv==this.points[i].yval){
-this.points[i].errorMinus=parseFloat(_6[2]);
-this.points[i].errorPlus=parseFloat(_6[3]);
-}
-}
-}
-};
-DygraphLayout.prototype.removeAllDatasets=function(){
-delete this.datasets;
-this.datasets=new Array();
-};
-DygraphLayout.prototype.updateOptions=function(_9){
-MochiKit.Base.update(this.options,_9?_9:{});
-};
-DygraphCanvasRenderer=function(_10,_11,_12){
-PlotKit.CanvasRenderer.call(this,_10,_11,_12);
-this.options.shouldFill=false;
-this.options.shouldStroke=true;
-this.options.drawYGrid=true;
-this.options.drawXGrid=true;
-this.options.gridLineColor=MochiKit.Color.Color.grayColor();
-MochiKit.Base.update(this.options,_12);
-this.options.drawBackground=false;
-};
-DygraphCanvasRenderer.prototype=new PlotKit.CanvasRenderer();
 DygraphCanvasRenderer.prototype.render=function(){
 var ctx=this.element.getContext("2d");
 if(this.options.drawYGrid){
-var _14=this.layout.yticks;
+var _36=this.layout.yticks;
 ctx.save();
 ctx.strokeStyle=this.options.gridLineColor.toRGBString();
 ctx.lineWidth=this.options.axisLineWidth;
-for(var i=0;i<_14.length;i++){
+for(var i=0;i<_36.length;i++){
 var x=this.area.x;
-var y=this.area.y+_14[i][0]*this.area.h;
+var y=this.area.y+_36[i][0]*this.area.h;
 ctx.beginPath();
 ctx.moveTo(x,y);
 ctx.lineTo(x+this.area.w,y);
@@ -4516,12 +4242,12 @@ ctx.stroke();
 }
 }
 if(this.options.drawXGrid){
-var _14=this.layout.xticks;
+var _36=this.layout.xticks;
 ctx.save();
 ctx.strokeStyle=this.options.gridLineColor.toRGBString();
 ctx.lineWidth=this.options.axisLineWidth;
-for(var i=0;i<_14.length;i++){
-var x=this.area.x+_14[i][0]*this.area.w;
+for(var i=0;i<_36.length;i++){
+var x=this.area.x+_36[i][0]*this.area.w;
 var y=this.area.y+this.area.h;
 ctx.beginPath();
 ctx.moveTo(x,y);
@@ -4531,105 +4257,213 @@ ctx.stroke();
 }
 }
 this._renderLineChart();
-this._renderLineAxis();
+this._renderAxis();
 };
-DygraphCanvasRenderer.prototype._renderLineChart=function(){
-var _17=this.element.getContext("2d");
-var _18=this.options.colorScheme.length;
-var _19=this.options.colorScheme;
-var _20=MochiKit.Base.keys(this.layout.datasets);
-var _21=this.layout.options.errorBars;
-var _22=_20.length;
-var _23=MochiKit.Base.bind;
-var _24=MochiKit.Base.partial;
-var _25=function(_26){
-_26.canvasx=this.area.w*_26.x+this.area.x;
-_26.canvasy=this.area.h*_26.y+this.area.y;
-};
-MochiKit.Iter.forEach(this.layout.points,_25,this);
-var _27=function(ctx){
-for(var i=0;i<_22;i++){
-var _28=_20[i];
-var _29=_19[i%_18];
-var _30=this.options.strokeColorTransform;
-_17.save();
-_17.strokeStyle=_29.toRGBString();
-_17.lineWidth=this.options.strokeWidth;
-ctx.beginPath();
-var _31=this.layout.points[0];
-var _32=true;
-var _33=function(_34,_31){
-if(_31.name==_28){
-if(!_31.canvasy||isNaN(_31.canvasy)){
-_32=true;
-}else{
-if(_32){
-_34.moveTo(_31.canvasx,_31.canvasy);
-_32=false;
+DygraphCanvasRenderer.prototype._renderAxis=function(){
+if(!this.options.drawXAxis&&!this.options.drawYAxis){
+return;
+}
+var _39=this.element.getContext("2d");
+var _40={"style":{"position":"absolute","fontSize":this.options.axisLabelFontSize+"px","zIndex":10,"color":this.options.axisLabelColor.toRGBString(),"width":this.options.axisLabelWidth+"px","overflow":"hidden"}};
+_39.save();
+_39.strokeStyle=this.options.axisLineColor.toRGBString();
+_39.lineWidth=this.options.axisLineWidth;
+if(this.options.drawYAxis){
+if(this.layout.yticks){
+var _41=function(_42){
+if(typeof (_42)=="function"){
+return;
+}
+var x=this.area.x;
+var y=this.area.y+_42[0]*this.area.h;
+_39.beginPath();
+_39.moveTo(x,y);
+_39.lineTo(x-this.options.axisTickSize,y);
+_39.closePath();
+_39.stroke();
+var _43=DIV(_40,_42[1]);
+var top=(y-this.options.axisLabelFontSize/2);
+if(top<0){
+top=0;
+}
+if(top+this.options.axisLabelFontSize+3>this.height){
+_43.style.bottom="0px";
 }else{
-_34.lineTo(_31.canvasx,_31.canvasy);
+_43.style.top=top+"px";
+}
+_43.style.left="0px";
+_43.style.textAlign="right";
+_43.style.width=this.options.yAxisLabelWidth+"px";
+MochiKit.DOM.appendChildNodes(this.container,_43);
+this.ylabels.push(_43);
+};
+MochiKit.Iter.forEach(this.layout.yticks,bind(_41,this));
+var _45=this.ylabels[0];
+var _46=this.options.axisLabelFontSize;
+var _47=parseInt(_45.style.top)+_46;
+if(_47>this.height-_46){
+_45.style.top=(parseInt(_45.style.top)-_46/2)+"px";
+}
 }
+_39.beginPath();
+_39.moveTo(this.area.x,this.area.y);
+_39.lineTo(this.area.x,this.area.y+this.area.h);
+_39.closePath();
+_39.stroke();
 }
+if(this.options.drawXAxis){
+if(this.layout.xticks){
+var _41=function(_48){
+if(typeof (dataset)=="function"){
+return;
 }
+var x=this.area.x+_48[0]*this.area.w;
+var y=this.area.y+this.area.h;
+_39.beginPath();
+_39.moveTo(x,y);
+_39.lineTo(x,y+this.options.axisTickSize);
+_39.closePath();
+_39.stroke();
+var _49=DIV(_40,_48[1]);
+_49.style.textAlign="center";
+_49.style.bottom="0px";
+var _50=(x-this.options.axisLabelWidth/2);
+if(_50+this.options.axisLabelWidth>this.width){
+_50=this.width-this.options.xAxisLabelWidth;
+_49.style.textAlign="right";
+}
+if(_50<0){
+_50=0;
+_49.style.textAlign="left";
+}
+_49.style.left=_50+"px";
+_49.style.width=this.options.xAxisLabelWidth+"px";
+MochiKit.DOM.appendChildNodes(this.container,_49);
+this.xlabels.push(_49);
+};
+MochiKit.Iter.forEach(this.layout.xticks,bind(_41,this));
+}
+_39.beginPath();
+_39.moveTo(this.area.x,this.area.y+this.area.h);
+_39.lineTo(this.area.x+this.area.w,this.area.y+this.area.h);
+_39.closePath();
+_39.stroke();
+}
+_39.restore();
 };
-MochiKit.Iter.forEach(this.layout.points,_24(_33,ctx),this);
+DygraphCanvasRenderer.prototype._renderLineChart=function(){
+var _51=this.element.getContext("2d");
+var _52=this.options.colorScheme.length;
+var _53=this.options.colorScheme;
+var _54=MochiKit.Base.keys(this.layout.datasets);
+var _55=this.layout.options.errorBars;
+var _56=_54.length;
+var _57=MochiKit.Base.bind;
+var _58=MochiKit.Base.partial;
+var _59=function(_60){
+_60.canvasx=this.area.w*_60.x+this.area.x;
+_60.canvasy=this.area.h*_60.y+this.area.y;
+};
+MochiKit.Iter.forEach(this.layout.points,_59,this);
+var _61=function(x){
+return x&&!isNaN(x);
+};
+var _62=function(ctx){
+for(var i=0;i<_56;i++){
+var _63=_54[i];
+var _64=_53[i%_52];
+var _65=this.options.strokeColorTransform;
+_51.save();
+_51.strokeStyle=_64.toRGBString();
+_51.lineWidth=this.options.strokeWidth;
+var _66=this.layout.points[0];
+var _67=this.dygraph_.attr_("pointSize");
+var _68=null,prevY=null;
+var _69=this.dygraph_.attr_("drawPoints");
+var _70=this.layout.points;
+for(var j=0;j<_70.length;j++){
+var _66=_70[j];
+if(_66.name==_63){
+if(!_61(_66.canvasy)){
+_68=prevY=null;
+}else{
+var _71=(!_68&&(j==_70.length-1||!_61(_70[j+1].canvasy)));
+if(!_68){
+_68=_66.canvasx;
+prevY=_66.canvasy;
+}else{
+ctx.beginPath();
+ctx.moveTo(_68,prevY);
+_68=_66.canvasx;
+prevY=_66.canvasy;
+ctx.lineTo(_68,prevY);
 ctx.stroke();
 }
+if(_69||_71){
+ctx.beginPath();
+ctx.fillStyle=_64.toRGBString();
+ctx.arc(_66.canvasx,_66.canvasy,_67,0,360,false);
+ctx.fill();
+}
+}
+}
+}
+}
 };
-var _35=function(ctx){
-for(var i=0;i<_22;i++){
-var _36=_20[i];
-var _37=_19[i%_18];
-var _38=this.options.strokeColorTransform;
-_17.save();
-_17.strokeStyle=_37.toRGBString();
-_17.lineWidth=this.options.strokeWidth;
-var _39=-1;
-var _40=[-1,-1];
-var _41=0;
-var _42=this.layout.yscale;
-var _43=function(_44,_45){
-_41++;
-if(_45.name==_36){
-if(!_45.y||isNaN(_45.y)){
-_39=-1;
+var _72=function(ctx){
+for(var i=0;i<_56;i++){
+var _73=_54[i];
+var _74=_53[i%_52];
+var _75=this.options.strokeColorTransform;
+_51.save();
+_51.strokeStyle=_74.toRGBString();
+_51.lineWidth=this.options.strokeWidth;
+var _76=-1;
+var _77=[-1,-1];
+var _78=0;
+var _79=this.layout.yscale;
+var _80=function(_81,_82){
+_78++;
+if(_82.name==_73){
+if(!_82.y||isNaN(_82.y)){
+_76=-1;
 return;
 }
-var _46=[_45.y-_45.errorPlus*_42,_45.y+_45.errorMinus*_42];
-_46[0]=this.area.h*_46[0]+this.area.y;
-_46[1]=this.area.h*_46[1]+this.area.y;
-if(_39>=0){
-_44.moveTo(_39,_40[0]);
-_44.lineTo(_45.canvasx,_46[0]);
-_44.lineTo(_45.canvasx,_46[1]);
-_44.lineTo(_39,_40[1]);
-_44.closePath();
+var _83=[_82.y-_82.errorPlus*_79,_82.y+_82.errorMinus*_79];
+_83[0]=this.area.h*_83[0]+this.area.y;
+_83[1]=this.area.h*_83[1]+this.area.y;
+if(_76>=0){
+_81.moveTo(_76,_77[0]);
+_81.lineTo(_82.canvasx,_83[0]);
+_81.lineTo(_82.canvasx,_83[1]);
+_81.lineTo(_76,_77[1]);
+_81.closePath();
 }
-_40[0]=_46[0];
-_40[1]=_46[1];
-_39=_45.canvasx;
+_77[0]=_83[0];
+_77[1]=_83[1];
+_76=_82.canvasx;
 }
 };
-var _47=_37.colorWithAlpha(0.15);
-ctx.fillStyle=_47.toRGBString();
+var _84=_74.colorWithAlpha(0.15);
+ctx.fillStyle=_84.toRGBString();
 ctx.beginPath();
-MochiKit.Iter.forEach(this.layout.points,_24(_43,ctx),this);
+MochiKit.Iter.forEach(this.layout.points,_58(_80,ctx),this);
 ctx.fill();
 }
 };
-if(_21){
-_23(_35,this)(_17);
+if(_55){
+_57(_72,this)(_51);
 }
-_23(_27,this)(_17);
-_17.restore();
+_57(_62,this)(_51);
+_51.restore();
 };
-Dygraph=function(div,_49,_50){
+Dygraph=function(div,_86,_87){
 if(arguments.length>0){
 if(arguments.length==4){
 this.warn("Using deprecated four-argument dygraph constructor");
-this.__old_init__(div,_49,arguments[2],arguments[3]);
+this.__old_init__(div,_86,arguments[2],arguments[3]);
 }else{
-this.__init__(div,_49,_50);
+this.__init__(div,_86,_87);
 }
 }
 };
@@ -4650,29 +4484,28 @@ Dygraph.DEBUG=1;
 Dygraph.INFO=2;
 Dygraph.WARNING=3;
 Dygraph.ERROR=3;
-Dygraph.prototype.__old_init__=function(div,_51,_52,_53){
-if(_52!=null){
-var _54=["Date"];
-for(var i=0;i<_52.length;i++){
-_54.push(_52[i]);
+Dygraph.prototype.__old_init__=function(div,_88,_89,_90){
+if(_89!=null){
+var _91=["Date"];
+for(var i=0;i<_89.length;i++){
+_91.push(_89[i]);
 }
-MochiKit.Base.update(_53,{"labels":_54});
+MochiKit.Base.update(_90,{"labels":_91});
 }
-this.__init__(div,_51,_53);
+this.__init__(div,_88,_90);
 };
-Dygraph.prototype.__init__=function(div,_55,_56){
-if(_56==null){
-_56={};
+Dygraph.prototype.__init__=function(div,_92,_93){
+if(_93==null){
+_93={};
 }
 this.maindiv_=div;
-this.file_=_55;
-this.rollPeriod_=_56.rollPeriod||Dygraph.DEFAULT_ROLL_PERIOD;
+this.file_=_92;
+this.rollPeriod_=_93.rollPeriod||Dygraph.DEFAULT_ROLL_PERIOD;
 this.previousVerticalX_=-1;
-this.fractions_=_56.fractions||false;
-this.dateWindow_=_56.dateWindow||null;
-this.valueRange_=_56.valueRange||null;
-this.wilsonInterval_=_56.wilsonInterval||true;
-this.customBars_=_56.customBars||false;
+this.fractions_=_93.fractions||false;
+this.dateWindow_=_93.dateWindow||null;
+this.valueRange_=_93.valueRange||null;
+this.wilsonInterval_=_93.wilsonInterval||true;
 div.innerHTML="";
 if(div.style.width==""){
 div.style.width=Dygraph.DEFAULT_WIDTH+"px";
@@ -4683,71 +4516,71 @@ div.style.height=Dygraph.DEFAULT_HEIGHT+"px";
 this.width_=parseInt(div.style.width,10);
 this.height_=parseInt(div.style.height,10);
 this.user_attrs_={};
-MochiKit.Base.update(this.user_attrs_,_56);
+MochiKit.Base.update(this.user_attrs_,_93);
 this.attrs_={};
 MochiKit.Base.update(this.attrs_,Dygraph.DEFAULT_ATTRS);
 this.labelsFromCSV_=(this.attr_("labels")==null);
 this.createInterface_();
-this.layoutOptions_={"errorBars":(this.attr_("errorBars")||this.customBars_),"xOriginIsZero":false};
+this.layoutOptions_={"errorBars":(this.attr_("errorBars")||this.attr_("customBars")),"xOriginIsZero":false};
 MochiKit.Base.update(this.layoutOptions_,this.attrs_);
 MochiKit.Base.update(this.layoutOptions_,this.user_attrs_);
-this.layout_=new DygraphLayout(this.layoutOptions_);
+this.layout_=new DygraphLayout(this,this.layoutOptions_);
 this.renderOptions_={colorScheme:this.colors_,strokeColor:null,axisLineWidth:Dygraph.AXIS_LINE_WIDTH};
 MochiKit.Base.update(this.renderOptions_,this.attrs_);
 MochiKit.Base.update(this.renderOptions_,this.user_attrs_);
-this.plotter_=new DygraphCanvasRenderer(this.hidden_,this.layout_,this.renderOptions_);
+this.plotter_=new DygraphCanvasRenderer(this,this.hidden_,this.layout_,this.renderOptions_);
 this.createStatusMessage_();
 this.createRollInterface_();
 this.createDragInterface_();
 this.start_();
 };
-Dygraph.prototype.attr_=function(_57){
-if(typeof (this.user_attrs_[_57])!="undefined"){
-return this.user_attrs_[_57];
+Dygraph.prototype.attr_=function(_94){
+if(typeof (this.user_attrs_[_94])!="undefined"){
+return this.user_attrs_[_94];
 }else{
-if(typeof (this.attrs_[_57])!="undefined"){
-return this.attrs_[_57];
+if(typeof (this.attrs_[_94])!="undefined"){
+return this.attrs_[_94];
 }else{
 return null;
 }
 }
 };
-Dygraph.prototype.log=function(_58,_59){
+Dygraph.prototype.log=function(_95,_96){
 if(typeof (console)!="undefined"){
-switch(_58){
+switch(_95){
 case Dygraph.DEBUG:
-console.debug("dygraphs: "+_59);
+console.debug("dygraphs: "+_96);
 break;
 case Dygraph.INFO:
-console.info("dygraphs: "+_59);
+console.info("dygraphs: "+_96);
 break;
 case Dygraph.WARNING:
-console.warn("dygraphs: "+_59);
+console.warn("dygraphs: "+_96);
 break;
 case Dygraph.ERROR:
-console.error("dygraphs: "+_59);
+console.error("dygraphs: "+_96);
 break;
 }
 }
 };
-Dygraph.prototype.info=function(_60){
-this.log(Dygraph.INFO,_60);
+Dygraph.prototype.info=function(_97){
+this.log(Dygraph.INFO,_97);
 };
-Dygraph.prototype.warn=function(_61){
-this.log(Dygraph.WARNING,_61);
+Dygraph.prototype.warn=function(_98){
+this.log(Dygraph.WARNING,_98);
 };
-Dygraph.prototype.error=function(_62){
-this.log(Dygraph.ERROR,_62);
+Dygraph.prototype.error=function(_99){
+this.log(Dygraph.ERROR,_99);
 };
 Dygraph.prototype.rollPeriod=function(){
 return this.rollPeriod_;
 };
 Dygraph.prototype.createInterface_=function(){
-var _63=this.maindiv_;
+var _100=this.maindiv_;
 this.graphDiv=MochiKit.DOM.DIV({style:{"width":this.width_+"px","height":this.height_+"px"}});
-appendChildNodes(_63,this.graphDiv);
-var _64=MochiKit.DOM.CANVAS;
-this.canvas_=_64({style:{"position":"absolute"},width:this.width_,height:this.height_});
+appendChildNodes(_100,this.graphDiv);
+var _101=MochiKit.DOM.CANVAS;
+this.canvas_=_101({style:{"position":"absolute"},width:this.width_,height:this.height_});
 appendChildNodes(this.graphDiv,this.canvas_);
 this.hidden_=this.createPlotKitCanvas_(this.canvas_);
 connect(this.hidden_,"onmousemove",this,function(e){
@@ -4757,11 +4590,11 @@ connect(this.hidden_,"onmouseout",this,function(e){
 this.mouseOut_(e);
 });
 };
-Dygraph.prototype.createPlotKitCanvas_=function(_66){
+Dygraph.prototype.createPlotKitCanvas_=function(_103){
 var h=document.createElement("canvas");
 h.style.position="absolute";
-h.style.top=_66.style.top;
-h.style.left=_66.style.left;
+h.style.top=_103.style.top;
+h.style.left=_103.style.left;
 h.width=this.width_;
 h.height=this.height_;
 MochiKit.DOM.appendChildNodes(this.graphDiv,h);
@@ -4770,8 +4603,8 @@ return h;
 Dygraph.prototype.setColors_=function(){
 var num=this.attr_("labels").length-1;
 this.colors_=[];
-var _69=this.attr_("colors");
-if(!_69){
+var _106=this.attr_("colors");
+if(!_106){
 var sat=this.attr_("colorSaturation")||1;
 var val=this.attr_("colorValue")||0.5;
 for(var i=1;i<=num;i++){
@@ -4780,8 +4613,8 @@ this.colors_.push(MochiKit.Color.Color.fromHSV(hue,sat,val));
 }
 }else{
 for(var i=0;i<num;i++){
-var _73=_69[i%_69.length];
-this.colors_.push(MochiKit.Color.Color.fromString(_73));
+var _110=_106[i%_106.length];
+this.colors_.push(MochiKit.Color.Color.fromString(_110));
 }
 }
 this.renderOptions_.colorScheme=this.colors_;
@@ -4791,201 +4624,201 @@ MochiKit.Base.update(this.layoutOptions_,this.attrs_);
 };
 Dygraph.prototype.createStatusMessage_=function(){
 if(!this.attr_("labelsDiv")){
-var _74=this.attr_("labelsDivWidth");
-var _75={"style":{"position":"absolute","fontSize":"14px","zIndex":10,"width":_74+"px","top":"0px","left":(this.width_-_74-2)+"px","background":"white","textAlign":"left","overflow":"hidden"}};
-MochiKit.Base.update(_75["style"],this.attr_("labelsDivStyles"));
-var div=MochiKit.DOM.DIV(_75);
+var _111=this.attr_("labelsDivWidth");
+var _112={"style":{"position":"absolute","fontSize":"14px","zIndex":10,"width":_111+"px","top":"0px","left":(this.width_-_111-2)+"px","background":"white","textAlign":"left","overflow":"hidden"}};
+MochiKit.Base.update(_112["style"],this.attr_("labelsDivStyles"));
+var div=MochiKit.DOM.DIV(_112);
 MochiKit.DOM.appendChildNodes(this.graphDiv,div);
 this.attrs_.labelsDiv=div;
 }
 };
 Dygraph.prototype.createRollInterface_=function(){
-var _76=this.attr_("showRoller")?"block":"none";
-var _77={"type":"text","size":"2","value":this.rollPeriod_,"style":{"position":"absolute","zIndex":10,"top":(this.plotter_.area.h-25)+"px","left":(this.plotter_.area.x+1)+"px","display":_76}};
-var _78=MochiKit.DOM.INPUT(_77);
+var _113=this.attr_("showRoller")?"block":"none";
+var _114={"type":"text","size":"2","value":this.rollPeriod_,"style":{"position":"absolute","zIndex":10,"top":(this.plotter_.area.h-25)+"px","left":(this.plotter_.area.x+1)+"px","display":_113}};
+var _115=MochiKit.DOM.INPUT(_114);
 var pa=this.graphDiv;
-MochiKit.DOM.appendChildNodes(pa,_78);
-connect(_78,"onchange",this,function(){
-this.adjustRoll(_78.value);
+MochiKit.DOM.appendChildNodes(pa,_115);
+connect(_115,"onchange",this,function(){
+this.adjustRoll(_115.value);
 });
-return _78;
+return _115;
 };
 Dygraph.prototype.createDragInterface_=function(){
-var _80=this;
-var _81=false;
-var _82=null;
-var _83=null;
-var _84=null;
-var _85=null;
-var _86=null;
+var self=this;
+var _118=false;
+var _119=null;
+var _120=null;
+var _121=null;
+var _122=null;
+var _123=null;
 var px=0;
 var py=0;
-var _89=function(e){
+var getX=function(e){
 return e.mouse().page.x-px;
 };
-var _90=function(e){
+var getY=function(e){
 return e.mouse().page.y-py;
 };
-connect(this.hidden_,"onmousemove",function(_91){
-if(_81){
-_84=_89(_91);
-_85=_90(_91);
-_80.drawZoomRect_(_82,_84,_86);
-_86=_84;
+connect(this.hidden_,"onmousemove",function(_128){
+if(_118){
+_121=getX(_128);
+_122=getY(_128);
+self.drawZoomRect_(_119,_121,_123);
+_123=_121;
 }
 });
-connect(this.hidden_,"onmousedown",function(_92){
-_81=true;
-px=PlotKit.Base.findPosX(_80.canvas_);
-py=PlotKit.Base.findPosY(_80.canvas_);
-_82=_89(_92);
-_83=_90(_92);
+connect(this.hidden_,"onmousedown",function(_129){
+_118=true;
+px=PlotKit.Base.findPosX(self.canvas_);
+py=PlotKit.Base.findPosY(self.canvas_);
+_119=getX(_129);
+_120=getY(_129);
 });
-connect(document,"onmouseup",this,function(_93){
-if(_81){
-_81=false;
-_82=null;
-_83=null;
+connect(document,"onmouseup",this,function(_130){
+if(_118){
+_118=false;
+_119=null;
+_120=null;
 }
 });
-connect(this.hidden_,"onmouseout",this,function(_94){
-if(_81){
-_84=null;
-_85=null;
+connect(this.hidden_,"onmouseout",this,function(_131){
+if(_118){
+_121=null;
+_122=null;
 }
 });
-connect(this.hidden_,"onmouseup",this,function(_95){
-if(_81){
-_81=false;
-_84=_89(_95);
-_85=_90(_95);
-var _96=Math.abs(_84-_82);
-var _97=Math.abs(_85-_83);
-if(_96<2&&_97<2&&_80.attr_("clickCallback")!=null&&_80.lastx_!=undefined){
-_80.attr_("clickCallback")(_95,new Date(_80.lastx_));
+connect(this.hidden_,"onmouseup",this,function(_132){
+if(_118){
+_118=false;
+_121=getX(_132);
+_122=getY(_132);
+var _133=Math.abs(_121-_119);
+var _134=Math.abs(_122-_120);
+if(_133<2&&_134<2&&self.attr_("clickCallback")!=null&&self.lastx_!=undefined){
+self.attr_("clickCallback")(_132,new Date(self.lastx_));
 }
-if(_96>=10){
-_80.doZoom_(Math.min(_82,_84),Math.max(_82,_84));
+if(_133>=10){
+self.doZoom_(Math.min(_119,_121),Math.max(_119,_121));
 }else{
-_80.canvas_.getContext("2d").clearRect(0,0,_80.canvas_.width,_80.canvas_.height);
+self.canvas_.getContext("2d").clearRect(0,0,self.canvas_.width,self.canvas_.height);
 }
-_82=null;
-_83=null;
+_119=null;
+_120=null;
 }
 });
-connect(this.hidden_,"ondblclick",this,function(_98){
-_80.dateWindow_=null;
-_80.drawGraph_(_80.rawData_);
-var _99=_80.rawData_[0][0];
-var _100=_80.rawData_[_80.rawData_.length-1][0];
-if(_80.attr_("zoomCallback")){
-_80.attr_("zoomCallback")(_99,_100);
+connect(this.hidden_,"ondblclick",this,function(_135){
+self.dateWindow_=null;
+self.drawGraph_(self.rawData_);
+var _136=self.rawData_[0][0];
+var _137=self.rawData_[self.rawData_.length-1][0];
+if(self.attr_("zoomCallback")){
+self.attr_("zoomCallback")(_136,_137);
 }
 });
 };
-Dygraph.prototype.drawZoomRect_=function(_101,endX,_103){
+Dygraph.prototype.drawZoomRect_=function(_138,endX,_140){
 var ctx=this.canvas_.getContext("2d");
-if(_103){
-ctx.clearRect(Math.min(_101,_103),0,Math.abs(_101-_103),this.height_);
+if(_140){
+ctx.clearRect(Math.min(_138,_140),0,Math.abs(_138-_140),this.height_);
 }
-if(endX&&_101){
+if(endX&&_138){
 ctx.fillStyle="rgba(128,128,128,0.33)";
-ctx.fillRect(Math.min(_101,endX),0,Math.abs(endX-_101),this.height_);
+ctx.fillRect(Math.min(_138,endX),0,Math.abs(endX-_138),this.height_);
 }
 };
-Dygraph.prototype.doZoom_=function(lowX,_105){
-var _106=this.layout_.points;
-var _107=null;
-var _108=null;
-for(var i=0;i<_106.length;i++){
-var cx=_106[i].canvasx;
-var x=_106[i].xval;
-if(cx<lowX&&(_107==null||x>_107)){
-_107=x;
+Dygraph.prototype.doZoom_=function(lowX,_142){
+var _143=this.layout_.points;
+var _144=null;
+var _145=null;
+for(var i=0;i<_143.length;i++){
+var cx=_143[i].canvasx;
+var x=_143[i].xval;
+if(cx<lowX&&(_144==null||x>_144)){
+_144=x;
 }
-if(cx>_105&&(_108==null||x<_108)){
-_108=x;
+if(cx>_142&&(_145==null||x<_145)){
+_145=x;
 }
 }
-if(_107==null){
-_107=_106[0].xval;
+if(_144==null){
+_144=_143[0].xval;
 }
-if(_108==null){
-_108=_106[_106.length-1].xval;
+if(_145==null){
+_145=_143[_143.length-1].xval;
 }
-this.dateWindow_=[_107,_108];
+this.dateWindow_=[_144,_145];
 this.drawGraph_(this.rawData_);
 if(this.attr_("zoomCallback")){
-this.attr_("zoomCallback")(_107,_108);
+this.attr_("zoomCallback")(_144,_145);
 }
 };
-Dygraph.prototype.mouseMove_=function(_110){
-var _111=_110.mouse().page.x-PlotKit.Base.findPosX(this.hidden_);
-var _112=this.layout_.points;
-var _113=-1;
-var _114=-1;
-var _115=1e+100;
+Dygraph.prototype.mouseMove_=function(_147){
+var _148=_147.mouse().page.x-PlotKit.Base.findPosX(this.hidden_);
+var _149=this.layout_.points;
+var _150=-1;
+var _151=-1;
+var _152=1e+100;
 var idx=-1;
-for(var i=0;i<_112.length;i++){
-var dist=Math.abs(_112[i].canvasx-_111);
-if(dist>_115){
+for(var i=0;i<_149.length;i++){
+var dist=Math.abs(_149[i].canvasx-_148);
+if(dist>_152){
 break;
 }
-_115=dist;
+_152=dist;
 idx=i;
 }
 if(idx>=0){
-_113=_112[idx].xval;
+_150=_149[idx].xval;
 }
-if(_111>_112[_112.length-1].canvasx){
-_113=_112[_112.length-1].xval;
+if(_148>_149[_149.length-1].canvasx){
+_150=_149[_149.length-1].xval;
 }
-var _118=[];
-for(var i=0;i<_112.length;i++){
-if(_112[i].xval==_113){
-_118.push(_112[i]);
+var _155=[];
+for(var i=0;i<_149.length;i++){
+if(_149[i].xval==_150){
+_155.push(_149[i]);
 }
 }
-var _119=this.attr_("highlightCircleSize");
+var _156=this.attr_("highlightCircleSize");
 var ctx=this.canvas_.getContext("2d");
 if(this.previousVerticalX_>=0){
 var px=this.previousVerticalX_;
-ctx.clearRect(px-_119-1,0,2*_119+2,this.height_);
+ctx.clearRect(px-_156-1,0,2*_156+2,this.height_);
 }
 var isOK=function(x){
 return x&&!isNaN(x);
 };
-if(_118.length>0){
-var _111=_118[0].canvasx;
-var _121=this.attr_("xValueFormatter")(_113,this)+":";
+if(_155.length>0){
+var _148=_155[0].canvasx;
+var _158=this.attr_("xValueFormatter")(_150,this)+":";
 var clen=this.colors_.length;
-for(var i=0;i<_118.length;i++){
-if(!isOK(_118[i].canvasy)){
+for(var i=0;i<_155.length;i++){
+if(!isOK(_155[i].canvasy)){
 continue;
 }
 if(this.attr_("labelsSeparateLines")){
-_121+="<br/>";
+_158+="<br/>";
 }
-var _123=_118[i];
-_121+=" <b><font color='"+this.colors_[i%clen].toHexString()+"'>"+_123.name+"</font></b>:"+this.round_(_123.yval,2);
+var _160=_155[i];
+_158+=" <b><font color='"+this.colors_[i%clen].toHexString()+"'>"+_160.name+"</font></b>:"+this.round_(_160.yval,2);
 }
-this.attr_("labelsDiv").innerHTML=_121;
-this.lastx_=_113;
+this.attr_("labelsDiv").innerHTML=_158;
+this.lastx_=_150;
 ctx.save();
-for(var i=0;i<_118.length;i++){
-if(!isOK(_118[i%clen].canvasy)){
+for(var i=0;i<_155.length;i++){
+if(!isOK(_155[i%clen].canvasy)){
 continue;
 }
 ctx.beginPath();
 ctx.fillStyle=this.colors_[i%clen].toRGBString();
-ctx.arc(_111,_118[i%clen].canvasy,_119,0,360,false);
+ctx.arc(_148,_155[i%clen].canvasy,_156,0,360,false);
 ctx.fill();
 }
 ctx.restore();
-this.previousVerticalX_=_111;
+this.previousVerticalX_=_148;
 }
 };
-Dygraph.prototype.mouseOut_=function(_124){
+Dygraph.prototype.mouseOut_=function(_161){
 var ctx=this.canvas_.getContext("2d");
 ctx.clearRect(0,0,this.width_,this.height_);
 this.attr_("labelsDiv").innerHTML="";
@@ -4998,34 +4831,34 @@ return ""+x;
 }
 };
 Dygraph.prototype.hmsString_=function(date){
-var _126=Dygraph.zeropad;
+var _163=Dygraph.zeropad;
 var d=new Date(date);
 if(d.getSeconds()){
-return _126(d.getHours())+":"+_126(d.getMinutes())+":"+_126(d.getSeconds());
+return _163(d.getHours())+":"+_163(d.getMinutes())+":"+_163(d.getSeconds());
 }else{
 if(d.getMinutes()){
-return _126(d.getHours())+":"+_126(d.getMinutes());
+return _163(d.getHours())+":"+_163(d.getMinutes());
 }else{
-return _126(d.getHours());
+return _163(d.getHours());
 }
 }
 };
 Dygraph.dateString_=function(date,self){
-var _129=Dygraph.zeropad;
+var _165=Dygraph.zeropad;
 var d=new Date(date);
 var year=""+d.getFullYear();
-var _131=_129(d.getMonth()+1);
-var day=_129(d.getDate());
+var _167=_165(d.getMonth()+1);
+var day=_165(d.getDate());
 var ret="";
 var frac=d.getHours()*3600+d.getMinutes()*60+d.getSeconds();
 if(frac){
 ret=" "+self.hmsString_(date);
 }
-return year+"/"+_131+"/"+day+ret;
+return year+"/"+_167+"/"+day+ret;
 };
-Dygraph.prototype.round_=function(num,_135){
-var _136=Math.pow(10,_135);
-return Math.round(num*_136)/_136;
+Dygraph.prototype.round_=function(num,_171){
+var _172=Math.pow(10,_171);
+return Math.round(num*_172)/_172;
 };
 Dygraph.prototype.loadedEvent_=function(data){
 this.rawData_=this.parseCSV_(data);
@@ -5034,16 +4867,16 @@ this.drawGraph_(this.rawData_);
 Dygraph.prototype.months=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];
 Dygraph.prototype.quarters=["Jan","Apr","Jul","Oct"];
 Dygraph.prototype.addXTicks_=function(){
-var _138,endDate;
+var _174,endDate;
 if(this.dateWindow_){
-_138=this.dateWindow_[0];
+_174=this.dateWindow_[0];
 endDate=this.dateWindow_[1];
 }else{
-_138=this.rawData_[0][0];
+_174=this.rawData_[0][0];
 endDate=this.rawData_[this.rawData_.length-1][0];
 }
-var _139=this.attr_("xTicker")(_138,endDate,this);
-this.layout_.updateOptions({xTicks:_139});
+var _175=this.attr_("xTicker")(_174,endDate,this);
+this.layout_.updateOptions({xTicks:_175});
 };
 Dygraph.SECONDLY=0;
 Dygraph.TEN_SECONDLY=1;
@@ -5072,161 +4905,161 @@ Dygraph.SHORT_SPACINGS[Dygraph.HOURLY]=1000*3600;
 Dygraph.SHORT_SPACINGS[Dygraph.HOURLY]=1000*3600*6;
 Dygraph.SHORT_SPACINGS[Dygraph.DAILY]=1000*86400;
 Dygraph.SHORT_SPACINGS[Dygraph.WEEKLY]=1000*604800;
-Dygraph.prototype.NumXTicks=function(_140,_141,_142){
-if(_142<Dygraph.MONTHLY){
-var _143=Dygraph.SHORT_SPACINGS[_142];
-return Math.floor(0.5+1*(_141-_140)/_143);
+Dygraph.prototype.NumXTicks=function(_176,_177,_178){
+if(_178<Dygraph.MONTHLY){
+var _179=Dygraph.SHORT_SPACINGS[_178];
+return Math.floor(0.5+1*(_177-_176)/_179);
 }else{
-var _144=1;
-var _145=12;
-if(_142==Dygraph.QUARTERLY){
-_145=3;
+var _180=1;
+var _181=12;
+if(_178==Dygraph.QUARTERLY){
+_181=3;
 }
-if(_142==Dygraph.BIANNUAL){
-_145=2;
+if(_178==Dygraph.BIANNUAL){
+_181=2;
 }
-if(_142==Dygraph.ANNUAL){
-_145=1;
+if(_178==Dygraph.ANNUAL){
+_181=1;
 }
-if(_142==Dygraph.DECADAL){
-_145=1;
-_144=10;
+if(_178==Dygraph.DECADAL){
+_181=1;
+_180=10;
 }
-var _146=365.2524*24*3600*1000;
-var _147=1*(_141-_140)/_146;
-return Math.floor(0.5+1*_147*_145/_144);
+var _182=365.2524*24*3600*1000;
+var _183=1*(_177-_176)/_182;
+return Math.floor(0.5+1*_183*_181/_180);
 }
 };
-Dygraph.prototype.GetXAxis=function(_148,_149,_150){
-var _151=[];
-if(_150<Dygraph.MONTHLY){
-var _152=Dygraph.SHORT_SPACINGS[_150];
-var _153="%d%b";
-if(_150<Dygraph.HOURLY){
-_148=_152*Math.floor(0.5+_148/_152);
+Dygraph.prototype.GetXAxis=function(_184,_185,_186){
+var _187=[];
+if(_186<Dygraph.MONTHLY){
+var _188=Dygraph.SHORT_SPACINGS[_186];
+var _189="%d%b";
+if(_186<Dygraph.HOURLY){
+_184=_188*Math.floor(0.5+_184/_188);
 }
-for(var t=_148;t<=_149;t+=_152){
+for(var t=_184;t<=_185;t+=_188){
 var d=new Date(t);
 var frac=d.getHours()*3600+d.getMinutes()*60+d.getSeconds();
-if(frac==0||_150>=Dygraph.DAILY){
-_151.push({v:t,label:new Date(t+3600*1000).strftime(_153)});
+if(frac==0||_186>=Dygraph.DAILY){
+_187.push({v:t,label:new Date(t+3600*1000).strftime(_189)});
 }else{
-_151.push({v:t,label:this.hmsString_(t)});
+_187.push({v:t,label:this.hmsString_(t)});
 }
 }
 }else{
-var _155;
-var _156=1;
-if(_150==Dygraph.MONTHLY){
-_155=[0,1,2,3,4,5,6,7,8,9,10,11,12];
+var _191;
+var _192=1;
+if(_186==Dygraph.MONTHLY){
+_191=[0,1,2,3,4,5,6,7,8,9,10,11,12];
 }else{
-if(_150==Dygraph.QUARTERLY){
-_155=[0,3,6,9];
+if(_186==Dygraph.QUARTERLY){
+_191=[0,3,6,9];
 }else{
-if(_150==Dygraph.BIANNUAL){
-_155=[0,6];
+if(_186==Dygraph.BIANNUAL){
+_191=[0,6];
 }else{
-if(_150==Dygraph.ANNUAL){
-_155=[0];
+if(_186==Dygraph.ANNUAL){
+_191=[0];
 }else{
-if(_150==Dygraph.DECADAL){
-_155=[0];
-_156=10;
+if(_186==Dygraph.DECADAL){
+_191=[0];
+_192=10;
 }
 }
 }
 }
 }
-var _157=new Date(_148).getFullYear();
-var _158=new Date(_149).getFullYear();
-var _159=Dygraph.zeropad;
-for(var i=_157;i<=_158;i++){
-if(i%_156!=0){
+var _193=new Date(_184).getFullYear();
+var _194=new Date(_185).getFullYear();
+var _195=Dygraph.zeropad;
+for(var i=_193;i<=_194;i++){
+if(i%_192!=0){
 continue;
 }
-for(var j=0;j<_155.length;j++){
-var _160=i+"/"+_159(1+_155[j])+"/01";
-var t=Date.parse(_160);
-if(t<_148||t>_149){
+for(var j=0;j<_191.length;j++){
+var _196=i+"/"+_195(1+_191[j])+"/01";
+var t=Date.parse(_196);
+if(t<_184||t>_185){
 continue;
 }
-_151.push({v:t,label:new Date(t).strftime("%b %y")});
+_187.push({v:t,label:new Date(t).strftime("%b %y")});
 }
 }
 }
-return _151;
+return _187;
 };
-Dygraph.dateTicker=function(_161,_162,self){
-var _163=-1;
+Dygraph.dateTicker=function(_197,_198,self){
+var _199=-1;
 for(var i=0;i<Dygraph.NUM_GRANULARITIES;i++){
-var _164=self.NumXTicks(_161,_162,i);
-if(self.width_/_164>=self.attr_("pixelsPerXLabel")){
-_163=i;
+var _200=self.NumXTicks(_197,_198,i);
+if(self.width_/_200>=self.attr_("pixelsPerXLabel")){
+_199=i;
 break;
 }
 }
-if(_163>=0){
-return self.GetXAxis(_161,_162,_163);
+if(_199>=0){
+return self.GetXAxis(_197,_198,_199);
 }else{
 }
 };
 Dygraph.numericTicks=function(minV,maxV,self){
-var _167=[1,2,5];
-var _168,low_val,high_val,nTicks;
-var _169=self.attr_("pixelsPerYLabel");
+var _203=[1,2,5];
+var _204,low_val,high_val,nTicks;
+var _205=self.attr_("pixelsPerYLabel");
 for(var i=-10;i<50;i++){
-var _170=Math.pow(10,i);
-for(var j=0;j<_167.length;j++){
-_168=_170*_167[j];
-low_val=Math.floor(minV/_168)*_168;
-high_val=Math.ceil(maxV/_168)*_168;
-nTicks=(high_val-low_val)/_168;
-var _171=self.height_/nTicks;
-if(_171>_169){
+var _206=Math.pow(10,i);
+for(var j=0;j<_203.length;j++){
+_204=_206*_203[j];
+low_val=Math.floor(minV/_204)*_204;
+high_val=Math.ceil(maxV/_204)*_204;
+nTicks=(high_val-low_val)/_204;
+var _207=self.height_/nTicks;
+if(_207>_205){
 break;
 }
 }
-if(_171>_169){
+if(_207>_205){
 break;
 }
 }
-var _172=[];
+var _208=[];
 for(var i=0;i<nTicks;i++){
-var _173=low_val+i*_168;
-var _174=self.round_(_173,2);
+var _209=low_val+i*_204;
+var _210=self.round_(_209,2);
 if(self.attr_("labelsKMB")){
 var k=1000;
-if(_173>=k*k*k){
-_174=self.round_(_173/(k*k*k),1)+"B";
+if(_209>=k*k*k){
+_210=self.round_(_209/(k*k*k),1)+"B";
 }else{
-if(_173>=k*k){
-_174=self.round_(_173/(k*k),1)+"M";
+if(_209>=k*k){
+_210=self.round_(_209/(k*k),1)+"M";
 }else{
-if(_173>=k){
-_174=self.round_(_173/k,1)+"K";
+if(_209>=k){
+_210=self.round_(_209/k,1)+"K";
 }
 }
 }
 }
-_172.push({label:_174,v:_173});
+_208.push({label:_210,v:_209});
 }
-return _172;
+return _208;
 };
 Dygraph.prototype.addYTicks_=function(minY,maxY){
-var _178=Dygraph.numericTicks(minY,maxY,this);
-this.layout_.updateOptions({yAxis:[minY,maxY],yTicks:_178});
+var _214=Dygraph.numericTicks(minY,maxY,this);
+this.layout_.updateOptions({yAxis:[minY,maxY],yTicks:_214});
 };
-Dygraph.prototype.extremeValues_=function(_179){
+Dygraph.prototype.extremeValues_=function(_215){
 var minY=null,maxY=null;
-var bars=this.attr_("errorBars")||this.customBars_;
+var bars=this.attr_("errorBars")||this.attr_("customBars");
 if(bars){
-for(var j=0;j<_179.length;j++){
-var y=_179[j][1][0];
+for(var j=0;j<_215.length;j++){
+var y=_215[j][1][0];
 if(!y){
 continue;
 }
-var low=y-_179[j][1][1];
-var high=y+_179[j][1][2];
+var low=y-_215[j][1][1];
+var high=y+_215[j][1][2];
 if(low>y){
 low=y;
 }
@@ -5241,8 +5074,8 @@ minY=low;
 }
 }
 }else{
-for(var j=0;j<_179.length;j++){
-var y=_179[j][1];
+for(var j=0;j<_215.length;j++){
+var y=_215[j][1];
 if(!y){
 continue;
 }
@@ -5260,65 +5093,66 @@ Dygraph.prototype.drawGraph_=function(data){
 var minY=null,maxY=null;
 this.layout_.removeAllDatasets();
 this.setColors_();
+this.attrs_["pointSize"]=0.5*this.attr_("highlightCircleSize");
 for(var i=1;i<data[0].length;i++){
-var _183=[];
+var _219=[];
 for(var j=0;j<data.length;j++){
 var date=data[j][0];
-_183[j]=[date,data[j][i]];
+_219[j]=[date,data[j][i]];
 }
-_183=this.rollingAverage(_183,this.rollPeriod_);
-var bars=this.attr_("errorBars")||this.customBars_;
+_219=this.rollingAverage(_219,this.rollPeriod_);
+var bars=this.attr_("errorBars")||this.attr_("customBars");
 if(this.dateWindow_){
 var low=this.dateWindow_[0];
 var high=this.dateWindow_[1];
-var _184=[];
-for(var k=0;k<_183.length;k++){
-if(_183[k][0]>=low&&_183[k][0]<=high){
-_184.push(_183[k]);
+var _220=[];
+for(var k=0;k<_219.length;k++){
+if(_219[k][0]>=low&&_219[k][0]<=high){
+_220.push(_219[k]);
 }
 }
-_183=_184;
+_219=_220;
 }
-var _185=this.extremeValues_(_183);
-var _186=_185[0];
-var _187=_185[1];
-if(!minY||_186<minY){
-minY=_186;
+var _221=this.extremeValues_(_219);
+var _222=_221[0];
+var _223=_221[1];
+if(!minY||_222<minY){
+minY=_222;
 }
-if(!maxY||_187>maxY){
-maxY=_187;
+if(!maxY||_223>maxY){
+maxY=_223;
 }
 if(bars){
 var vals=[];
-for(var j=0;j<_183.length;j++){
-vals[j]=[_183[j][0],_183[j][1][0],_183[j][1][1],_183[j][1][2]];
+for(var j=0;j<_219.length;j++){
+vals[j]=[_219[j][0],_219[j][1][0],_219[j][1][1],_219[j][1][2]];
 }
 this.layout_.addDataset(this.attr_("labels")[i],vals);
 }else{
-this.layout_.addDataset(this.attr_("labels")[i],_183);
+this.layout_.addDataset(this.attr_("labels")[i],_219);
 }
 }
 if(this.valueRange_!=null){
 this.addYTicks_(this.valueRange_[0],this.valueRange_[1]);
 }else{
 var span=maxY-minY;
-var _190=maxY+0.1*span;
-var _191=minY-0.1*span;
-if(_191<0&&minY>=0){
-_191=0;
+var _226=maxY+0.1*span;
+var _227=minY-0.1*span;
+if(_227<0&&minY>=0){
+_227=0;
 }
-if(_190>0&&maxY<=0){
-_190=0;
+if(_226>0&&maxY<=0){
+_226=0;
 }
 if(this.attr_("includeZero")){
 if(maxY<0){
-_190=0;
+_226=0;
 }
 if(minY>0){
-_191=0;
+_227=0;
 }
 }
-this.addYTicks_(_191,_190);
+this.addYTicks_(_227,_226);
 }
 this.addXTicks_();
 this.layout_.evaluateWithError();
@@ -5326,150 +5160,150 @@ this.plotter_.clear();
 this.plotter_.render();
 this.canvas_.getContext("2d").clearRect(0,0,this.canvas_.width,this.canvas_.height);
 };
-Dygraph.prototype.rollingAverage=function(_192,_193){
-if(_192.length<2){
-return _192;
+Dygraph.prototype.rollingAverage=function(_228,_229){
+if(_228.length<2){
+return _228;
 }
-var _193=Math.min(_193,_192.length-1);
-var _194=[];
-var _195=this.attr_("sigma");
+var _229=Math.min(_229,_228.length-1);
+var _230=[];
+var _231=this.attr_("sigma");
 if(this.fractions_){
 var num=0;
 var den=0;
 var mult=100;
-for(var i=0;i<_192.length;i++){
-num+=_192[i][1][0];
-den+=_192[i][1][1];
-if(i-_193>=0){
-num-=_192[i-_193][1][0];
-den-=_192[i-_193][1][1];
-}
-var date=_192[i][0];
-var _198=den?num/den:0;
+for(var i=0;i<_228.length;i++){
+num+=_228[i][1][0];
+den+=_228[i][1][1];
+if(i-_229>=0){
+num-=_228[i-_229][1][0];
+den-=_228[i-_229][1][1];
+}
+var date=_228[i][0];
+var _234=den?num/den:0;
 if(this.attr_("errorBars")){
 if(this.wilsonInterval_){
 if(den){
-var p=_198<0?0:_198,n=den;
-var pm=_195*Math.sqrt(p*(1-p)/n+_195*_195/(4*n*n));
-var _201=1+_195*_195/den;
-var low=(p+_195*_195/(2*den)-pm)/_201;
-var high=(p+_195*_195/(2*den)+pm)/_201;
-_194[i]=[date,[p*mult,(p-low)*mult,(high-p)*mult]];
+var p=_234<0?0:_234,n=den;
+var pm=_231*Math.sqrt(p*(1-p)/n+_231*_231/(4*n*n));
+var _237=1+_231*_231/den;
+var low=(p+_231*_231/(2*den)-pm)/_237;
+var high=(p+_231*_231/(2*den)+pm)/_237;
+_230[i]=[date,[p*mult,(p-low)*mult,(high-p)*mult]];
 }else{
-_194[i]=[date,[0,0,0]];
+_230[i]=[date,[0,0,0]];
 }
 }else{
-var _202=den?_195*Math.sqrt(_198*(1-_198)/den):1;
-_194[i]=[date,[mult*_198,mult*_202,mult*_202]];
+var _238=den?_231*Math.sqrt(_234*(1-_234)/den):1;
+_230[i]=[date,[mult*_234,mult*_238,mult*_238]];
 }
 }else{
-_194[i]=[date,mult*_198];
+_230[i]=[date,mult*_234];
 }
 }
 }else{
-if(this.customBars_){
+if(this.attr_("customBars")){
 var low=0;
 var mid=0;
 var high=0;
-var _204=0;
-for(var i=0;i<_192.length;i++){
-var data=_192[i][1];
+var _240=0;
+for(var i=0;i<_228.length;i++){
+var data=_228[i][1];
 var y=data[1];
-_194[i]=[_192[i][0],[y,y-data[0],data[2]-y]];
+_230[i]=[_228[i][0],[y,y-data[0],data[2]-y]];
 low+=data[0];
 mid+=y;
 high+=data[2];
-_204+=1;
-if(i-_193>=0){
-var prev=_192[i-_193];
+_240+=1;
+if(i-_229>=0){
+var prev=_228[i-_229];
 low-=prev[1][0];
 mid-=prev[1][1];
 high-=prev[1][2];
-_204-=1;
+_240-=1;
 }
-_194[i]=[_192[i][0],[1*mid/_204,1*(mid-low)/_204,1*(high-mid)/_204]];
+_230[i]=[_228[i][0],[1*mid/_240,1*(mid-low)/_240,1*(high-mid)/_240]];
 }
 }else{
-var _206=Math.min(_193-1,_192.length-2);
+var _242=Math.min(_229-1,_228.length-2);
 if(!this.attr_("errorBars")){
-if(_193==1){
-return _192;
+if(_229==1){
+return _228;
 }
-for(var i=0;i<_192.length;i++){
+for(var i=0;i<_228.length;i++){
 var sum=0;
-var _208=0;
-for(var j=Math.max(0,i-_193+1);j<i+1;j++){
-var y=_192[j][1];
+var _244=0;
+for(var j=Math.max(0,i-_229+1);j<i+1;j++){
+var y=_228[j][1];
 if(!y||isNaN(y)){
 continue;
 }
-_208++;
-sum+=_192[j][1];
+_244++;
+sum+=_228[j][1];
 }
-if(_208){
-_194[i]=[_192[i][0],sum/_208];
+if(_244){
+_230[i]=[_228[i][0],sum/_244];
 }else{
-_194[i]=[_192[i][0],null];
+_230[i]=[_228[i][0],null];
 }
 }
 }else{
-for(var i=0;i<_192.length;i++){
+for(var i=0;i<_228.length;i++){
 var sum=0;
-var _209=0;
-var _208=0;
-for(var j=Math.max(0,i-_193+1);j<i+1;j++){
-var y=_192[j][1][0];
+var _245=0;
+var _244=0;
+for(var j=Math.max(0,i-_229+1);j<i+1;j++){
+var y=_228[j][1][0];
 if(!y||isNaN(y)){
 continue;
 }
-_208++;
-sum+=_192[j][1][0];
-_209+=Math.pow(_192[j][1][1],2);
+_244++;
+sum+=_228[j][1][0];
+_245+=Math.pow(_228[j][1][1],2);
 }
-if(_208){
-var _202=Math.sqrt(_209)/_208;
-_194[i]=[_192[i][0],[sum/_208,_195*_202,_195*_202]];
+if(_244){
+var _238=Math.sqrt(_245)/_244;
+_230[i]=[_228[i][0],[sum/_244,_231*_238,_231*_238]];
 }else{
-_194[i]=[_192[i][0],[null,null,null]];
+_230[i]=[_228[i][0],[null,null,null]];
 }
 }
 }
 }
 }
-return _194;
+return _230;
 };
-Dygraph.dateParser=function(_210,self){
-var _211;
+Dygraph.dateParser=function(_246,self){
+var _247;
 var d;
-if(_210.length==10&&_210.search("-")!=-1){
-_211=_210.replace("-","/","g");
-while(_211.search("-")!=-1){
-_211=_211.replace("-","/");
+if(_246.length==10&&_246.search("-")!=-1){
+_247=_246.replace("-","/","g");
+while(_247.search("-")!=-1){
+_247=_247.replace("-","/");
 }
-d=Date.parse(_211);
+d=Date.parse(_247);
 }else{
-if(_210.length==8){
-_211=_210.substr(0,4)+"/"+_210.substr(4,2)+"/"+_210.substr(6,2);
-d=Date.parse(_211);
+if(_246.length==8){
+_247=_246.substr(0,4)+"/"+_246.substr(4,2)+"/"+_246.substr(6,2);
+d=Date.parse(_247);
 }else{
-d=Date.parse(_210);
+d=Date.parse(_246);
 }
 }
 if(!d||isNaN(d)){
-self.error("Couldn't parse "+_210+" as a date");
+self.error("Couldn't parse "+_246+" as a date");
 }
 return d;
 };
 Dygraph.prototype.detectTypeFromString_=function(str){
-var _213=false;
+var _249=false;
 if(str.indexOf("-")>=0||str.indexOf("/")>=0||isNaN(parseFloat(str))){
-_213=true;
+_249=true;
 }else{
 if(str.length==8&&str>"19700101"&&str<"20371231"){
-_213=true;
+_249=true;
 }
 }
-if(_213){
+if(_249){
 this.attrs_.xValueFormatter=Dygraph.dateString_;
 this.attrs_.xValueParser=Dygraph.dateParser;
 this.attrs_.xTicker=Dygraph.dateTicker;
@@ -5485,57 +5319,57 @@ this.attrs_.xTicker=Dygraph.numericTicks;
 };
 Dygraph.prototype.parseCSV_=function(data){
 var ret=[];
-var _214=data.split("\n");
-var _215=0;
+var _250=data.split("\n");
+var _251=0;
 if(this.labelsFromCSV_){
-_215=1;
-this.attrs_.labels=_214[0].split(",");
-}
-var _216;
-var _217=false;
-var _218=this.attr_("labels").length;
-for(var i=_215;i<_214.length;i++){
-var line=_214[i];
+_251=1;
+this.attrs_.labels=_250[0].split(",");
+}
+var _252;
+var _253=false;
+var _254=this.attr_("labels").length;
+for(var i=_251;i<_250.length;i++){
+var line=_250[i];
 if(line.length==0){
 continue;
 }
-var _220=line.split(",");
-if(_220.length<2){
+var _256=line.split(",");
+if(_256.length<2){
 continue;
 }
-var _221=[];
-if(!_217){
-this.detectTypeFromString_(_220[0]);
-_216=this.attr_("xValueParser");
-_217=true;
+var _257=[];
+if(!_253){
+this.detectTypeFromString_(_256[0]);
+_252=this.attr_("xValueParser");
+_253=true;
 }
-_221[0]=_216(_220[0],this);
+_257[0]=_252(_256[0],this);
 if(this.fractions_){
-for(var j=1;j<_220.length;j++){
-var vals=_220[j].split("/");
-_221[j]=[parseFloat(vals[0]),parseFloat(vals[1])];
+for(var j=1;j<_256.length;j++){
+var vals=_256[j].split("/");
+_257[j]=[parseFloat(vals[0]),parseFloat(vals[1])];
 }
 }else{
 if(this.attr_("errorBars")){
-for(var j=1;j<_220.length;j+=2){
-_221[(j+1)/2]=[parseFloat(_220[j]),parseFloat(_220[j+1])];
+for(var j=1;j<_256.length;j+=2){
+_257[(j+1)/2]=[parseFloat(_256[j]),parseFloat(_256[j+1])];
 }
 }else{
-if(this.customBars_){
-for(var j=1;j<_220.length;j++){
-var vals=_220[j].split(";");
-_221[j]=[parseFloat(vals[0]),parseFloat(vals[1]),parseFloat(vals[2])];
+if(this.attr_("customBars")){
+for(var j=1;j<_256.length;j++){
+var vals=_256[j].split(";");
+_257[j]=[parseFloat(vals[0]),parseFloat(vals[1]),parseFloat(vals[2])];
 }
 }else{
-for(var j=1;j<_220.length;j++){
-_221[j]=parseFloat(_220[j]);
+for(var j=1;j<_256.length;j++){
+_257[j]=parseFloat(_256[j]);
 }
 }
 }
 }
-ret.push(_221);
-if(_221.length!=_218){
-this.error("Number of columns in line "+i+" ("+_221.length+") does not agree with number of labels ("+_218+") "+line);
+ret.push(_257);
+if(_257.length!=_254){
+this.error("Number of columns in line "+i+" ("+_257.length+") does not agree with number of labels ("+_254+") "+line);
 }
 }
 return ret;
@@ -5559,19 +5393,19 @@ this.attrs_.labels.push("Y"+i);
 if(MochiKit.Base.isDateLike(data[0][0])){
 this.attrs_.xValueFormatter=Dygraph.dateString_;
 this.attrs_.xTicker=Dygraph.dateTicker;
-var _222=MochiKit.Base.clone(data);
+var _258=MochiKit.Base.clone(data);
 for(var i=0;i<data.length;i++){
-if(_222[i].length==0){
+if(_258[i].length==0){
 this.error("Row "<<(1+i)<<" of data is empty");
 return null;
 }
-if(_222[i][0]==null||typeof (_222[i][0].getTime)!="function"){
+if(_258[i][0]==null||typeof (_258[i][0].getTime)!="function"){
 this.error("x value in row "<<(1+i)<<" is not a Date");
 return null;
 }
-_222[i][0]=_222[i][0].getTime();
+_258[i][0]=_258[i][0].getTime();
 }
-return _222;
+return _258;
 }else{
 this.attrs_.xValueFormatter=function(x){
 return x;
@@ -5583,18 +5417,18 @@ return data;
 Dygraph.prototype.parseDataTable_=function(data){
 var cols=data.getNumberOfColumns();
 var rows=data.getNumberOfRows();
-var _225=[];
+var _261=[];
 for(var i=0;i<cols;i++){
-_225.push(data.getColumnLabel(i));
+_261.push(data.getColumnLabel(i));
 }
-this.attrs_.labels=_225;
-var _226=data.getColumnType(0);
-if(_226=="date"){
+this.attrs_.labels=_261;
+var _262=data.getColumnType(0);
+if(_262=="date"){
 this.attrs_.xValueFormatter=Dygraph.dateString_;
 this.attrs_.xValueParser=Dygraph.dateParser;
 this.attrs_.xTicker=Dygraph.dateTicker;
 }else{
-if(_226=="number"){
+if(_262=="number"){
 this.attrs_.xValueFormatter=function(x){
 return x;
 };
@@ -5603,7 +5437,7 @@ return parseFloat(x);
 };
 this.attrs_.xTicker=Dygraph.numericTicks;
 }else{
-this.error("only 'date' and 'number' types are supported for column 1 "+"of DataTable input (Got '"+_226+"')");
+this.error("only 'date' and 'number' types are supported for column 1 "+"of DataTable input (Got '"+_262+"')");
 return null;
 }
 }
@@ -5613,7 +5447,7 @@ var row=[];
 if(!data.getValue(i,0)){
 continue;
 }
-if(_226=="date"){
+if(_262=="date"){
 row.push(data.getValue(i,0).getTime());
 }else{
 row.push(data.getValue(i,0));
@@ -5642,11 +5476,11 @@ if(this.file_.indexOf("\n")>=0){
 this.loadedEvent_(this.file_);
 }else{
 var req=new XMLHttpRequest();
-var _229=this;
+var _265=this;
 req.onreadystatechange=function(){
 if(req.readyState==4){
 if(req.status==200){
-_229.loadedEvent_(req.responseText);
+_265.loadedEvent_(req.responseText);
 }
 }
 };
@@ -5660,39 +5494,36 @@ this.error("Unknown data format: "+(typeof this.file_));
 }
 }
 };
-Dygraph.prototype.updateOptions=function(_230){
-if(_230.customBars){
-this.customBars_=_230.customBars;
-}
-if(_230.rollPeriod){
-this.rollPeriod_=_230.rollPeriod;
+Dygraph.prototype.updateOptions=function(_266){
+if(_266.rollPeriod){
+this.rollPeriod_=_266.rollPeriod;
 }
-if(_230.dateWindow){
-this.dateWindow_=_230.dateWindow;
+if(_266.dateWindow){
+this.dateWindow_=_266.dateWindow;
 }
-if(_230.valueRange){
-this.valueRange_=_230.valueRange;
+if(_266.valueRange){
+this.valueRange_=_266.valueRange;
 }
-MochiKit.Base.update(this.user_attrs_,_230);
+MochiKit.Base.update(this.user_attrs_,_266);
 this.labelsFromCSV_=(this.attr_("labels")==null);
 this.layout_.updateOptions({"errorBars":this.attr_("errorBars")});
-if(_230["file"]&&_230["file"]!=this.file_){
-this.file_=_230["file"];
+if(_266["file"]&&_266["file"]!=this.file_){
+this.file_=_266["file"];
 this.start_();
 }else{
 this.drawGraph_(this.rawData_);
 }
 };
-Dygraph.prototype.adjustRoll=function(_231){
-this.rollPeriod_=_231;
+Dygraph.prototype.adjustRoll=function(_267){
+this.rollPeriod_=_267;
 this.drawGraph_(this.rawData_);
 };
-Dygraph.GVizChart=function(_232){
-this.container=_232;
+Dygraph.GVizChart=function(_268){
+this.container=_268;
 };
-Dygraph.GVizChart.prototype.draw=function(data,_233){
+Dygraph.GVizChart.prototype.draw=function(data,_269){
 this.container.innerHTML="";
-this.date_graph=new Dygraph(this.container,data,_233);
+this.date_graph=new Dygraph(this.container,data,_269);
 };
 DateGraph=Dygraph;