X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;ds=sidebyside;f=dygraph-combined.js;h=ae937ae8c81c9ff6c87e198f6f67abc98b32a869;hb=b0c3b7300e0faea480835763343e64884b169fb5;hp=417d0c105900eef759d926750237da35c5728c80;hpb=9f5cb22908f246a7eff80c19fffc5602be84eebe;p=dygraphs.git diff --git a/dygraph-combined.js b/dygraph-combined.js index 417d0c1..ae937ae 100644 --- a/dygraph-combined.js +++ b/dygraph-combined.js @@ -1002,7 +1002,7 @@ serializeJSON=MochiKit.Base.serializeJSON; } MochiKit.Base._exportSymbols(this,MochiKit.Base); if(typeof (dojo)!="undefined"){ -dojo.provide("MochiKit.Iter"); +dojo.provide("MochiKit.Color"); dojo.require("MochiKit.Base"); } if(typeof (JSAN)!="undefined"){ @@ -1014,605 +1014,485 @@ throw ""; } } catch(e){ -throw "MochiKit.Iter depends on MochiKit.Base!"; +throw "MochiKit.Color depends on MochiKit.Base"; } -if(typeof (MochiKit.Iter)=="undefined"){ -MochiKit.Iter={}; +if(typeof (MochiKit.Color)=="undefined"){ +MochiKit.Color={}; } -MochiKit.Iter.NAME="MochiKit.Iter"; -MochiKit.Iter.VERSION="1.4"; -MochiKit.Base.update(MochiKit.Iter,{__repr__:function(){ +MochiKit.Color.NAME="MochiKit.Color"; +MochiKit.Color.VERSION="1.4"; +MochiKit.Color.__repr__=function(){ return "["+this.NAME+" "+this.VERSION+"]"; -},toString:function(){ +}; +MochiKit.Color.toString=function(){ return this.__repr__(); -},registerIteratorFactory:function(name,_14e,_14f,_150){ -MochiKit.Iter.iteratorRegistry.register(name,_14e,_14f,_150); -},iter:function(_151,_152){ -var self=MochiKit.Iter; -if(arguments.length==2){ -return self.takewhile(function(a){ -return a!=_152; -},_151); -} -if(typeof (_151.next)=="function"){ -return _151; -}else{ -if(typeof (_151.iter)=="function"){ -return _151.iter(); -} +}; +MochiKit.Color.Color=function(red,_14e,blue,_150){ +if(typeof (_150)=="undefined"||_150===null){ +_150=1; } -try{ -return self.iteratorRegistry.match(_151); +this.rgb={r:red,g:_14e,b:blue,a:_150}; +}; +MochiKit.Color.Color.prototype={__class__:MochiKit.Color.Color,colorWithAlpha:function(_151){ +var rgb=this.rgb; +var m=MochiKit.Color; +return m.Color.fromRGB(rgb.r,rgb.g,rgb.b,_151); +},colorWithHue:function(hue){ +var hsl=this.asHSL(); +hsl.h=hue; +var m=MochiKit.Color; +return m.Color.fromHSL(hsl); +},colorWithSaturation:function(_157){ +var hsl=this.asHSL(); +hsl.s=_157; +var m=MochiKit.Color; +return m.Color.fromHSL(hsl); +},colorWithLightness:function(_15a){ +var hsl=this.asHSL(); +hsl.l=_15a; +var m=MochiKit.Color; +return m.Color.fromHSL(hsl); +},darkerColorWithLevel:function(_15d){ +var hsl=this.asHSL(); +hsl.l=Math.max(hsl.l-_15d,0); +var m=MochiKit.Color; +return m.Color.fromHSL(hsl); +},lighterColorWithLevel:function(_160){ +var hsl=this.asHSL(); +hsl.l=Math.min(hsl.l+_160,1); +var m=MochiKit.Color; +return m.Color.fromHSL(hsl); +},blendedColor:function(_163,_164){ +if(typeof (_164)=="undefined"||_164===null){ +_164=0.5; } -catch(e){ -var m=MochiKit.Base; -if(e==m.NotFound){ -e=new TypeError(typeof (_151)+": "+m.repr(_151)+" is not iterable"); +var sf=1-_164; +var s=this.rgb; +var d=_163.rgb; +var df=_164; +return MochiKit.Color.Color.fromRGB((s.r*sf)+(d.r*df),(s.g*sf)+(d.g*df),(s.b*sf)+(d.b*df),(s.a*sf)+(d.a*df)); +},compareRGB:function(_169){ +var a=this.asRGB(); +var b=_169.asRGB(); +return MochiKit.Base.compare([a.r,a.g,a.b,a.a],[b.r,b.g,b.b,b.a]); +},isLight:function(){ +return this.asHSL().b>0.5; +},isDark:function(){ +return (!this.isLight()); +},toHSLString:function(){ +var c=this.asHSL(); +var ccc=MochiKit.Color.clampColorComponent; +var rval=this._hslString; +if(!rval){ +var mid=(ccc(c.h,360).toFixed(0)+","+ccc(c.s,100).toPrecision(4)+"%"+","+ccc(c.l,100).toPrecision(4)+"%"); +var a=c.a; +if(a>=1){ +a=1; +rval="hsl("+mid+")"; +}else{ +if(a<=0){ +a=0; } -throw e; +rval="hsla("+mid+","+a+")"; } -},count:function(n){ -if(!n){ -n=0; +this._hslString=rval; } -var m=MochiKit.Base; -return {repr:function(){ -return "count("+n+")"; -},toString:m.forwardCall("repr"),next:m.counter(n)}; -},cycle:function(p){ -var self=MochiKit.Iter; -var m=MochiKit.Base; -var lst=[]; -var _15c=self.iter(p); -return {repr:function(){ -return "cycle(...)"; -},toString:m.forwardCall("repr"),next:function(){ -try{ -var rval=_15c.next(); -lst.push(rval); return rval; -} -catch(e){ -if(e!=self.StopIteration){ -throw e; -} -if(lst.length===0){ -this.next=function(){ -throw self.StopIteration; -}; +},toRGBString:function(){ +var c=this.rgb; +var ccc=MochiKit.Color.clampColorComponent; +var rval=this._rgbString; +if(!rval){ +var mid=(ccc(c.r,255).toFixed(0)+","+ccc(c.g,255).toFixed(0)+","+ccc(c.b,255).toFixed(0)); +if(c.a!=1){ +rval="rgba("+mid+","+c.a+")"; }else{ -var i=-1; -this.next=function(){ -i=(i+1)%lst.length; -return lst[i]; -}; -} -return this.next(); -} -}}; -},repeat:function(elem,n){ -var m=MochiKit.Base; -if(typeof (n)=="undefined"){ -return {repr:function(){ -return "repeat("+m.repr(elem)+")"; -},toString:m.forwardCall("repr"),next:function(){ -return elem; -}}; -} -return {repr:function(){ -return "repeat("+m.repr(elem)+", "+n+")"; -},toString:m.forwardCall("repr"),next:function(){ -if(n<=0){ -throw MochiKit.Iter.StopIteration; +rval="rgb("+mid+")"; } -n-=1; -return elem; -}}; -},next:function(_162){ -return _162.next(); -},izip:function(p,q){ -var m=MochiKit.Base; -var self=MochiKit.Iter; -var next=self.next; -var _168=m.map(self.iter,arguments); -return {repr:function(){ -return "izip(...)"; -},toString:m.forwardCall("repr"),next:function(){ -return m.map(next,_168); -}}; -},ifilter:function(pred,seq){ -var m=MochiKit.Base; -seq=MochiKit.Iter.iter(seq); -if(pred===null){ -pred=m.operator.truth; +this._rgbString=rval; } -return {repr:function(){ -return "ifilter(...)"; -},toString:m.forwardCall("repr"),next:function(){ -while(true){ -var rval=seq.next(); -if(pred(rval)){ return rval; +},asRGB:function(){ +return MochiKit.Base.clone(this.rgb); +},toHexString:function(){ +var m=MochiKit.Color; +var c=this.rgb; +var ccc=MochiKit.Color.clampColorComponent; +var rval=this._hexString; +if(!rval){ +rval=("#"+m.toColorPart(ccc(c.r,255))+m.toColorPart(ccc(c.g,255))+m.toColorPart(ccc(c.b,255))); +this._hexString=rval; } -} -return undefined; -}}; -},ifilterfalse:function(pred,seq){ -var m=MochiKit.Base; -seq=MochiKit.Iter.iter(seq); -if(pred===null){ -pred=m.operator.truth; -} -return {repr:function(){ -return "ifilterfalse(...)"; -},toString:m.forwardCall("repr"),next:function(){ -while(true){ -var rval=seq.next(); -if(!pred(rval)){ return rval; +},asHSV:function(){ +var hsv=this.hsv; +var c=this.rgb; +if(typeof (hsv)=="undefined"||hsv===null){ +hsv=MochiKit.Color.rgbToHSV(this.rgb); +this.hsv=hsv; } +return MochiKit.Base.clone(hsv); +},asHSL:function(){ +var hsl=this.hsl; +var c=this.rgb; +if(typeof (hsl)=="undefined"||hsl===null){ +hsl=MochiKit.Color.rgbToHSL(this.rgb); +this.hsl=hsl; } -return undefined; -}}; -},islice:function(seq){ -var self=MochiKit.Iter; -var m=MochiKit.Base; -seq=self.iter(seq); -var _174=0; -var stop=0; -var step=1; -var i=-1; -if(arguments.length==2){ -stop=arguments[1]; -}else{ -if(arguments.length==3){ -_174=arguments[1]; -stop=arguments[2]; -}else{ -_174=arguments[1]; -stop=arguments[2]; -step=arguments[3]; -} -} -return {repr:function(){ -return "islice("+["...",_174,stop,step].join(", ")+")"; -},toString:m.forwardCall("repr"),next:function(){ -var rval; -while(i<_174){ -rval=seq.next(); -i++; -} -if(_174>=stop){ -throw self.StopIteration; -} -_174+=step; -return rval; -}}; -},imap:function(fun,p,q){ -var m=MochiKit.Base; -var self=MochiKit.Iter; -var _17e=m.map(self.iter,m.extend(null,arguments,1)); -var map=m.map; -var next=self.next; -return {repr:function(){ -return "imap(...)"; -},toString:m.forwardCall("repr"),next:function(){ -return fun.apply(this,map(next,_17e)); -}}; -},applymap:function(fun,seq,self){ -seq=MochiKit.Iter.iter(seq); -var m=MochiKit.Base; -return {repr:function(){ -return "applymap(...)"; -},toString:m.forwardCall("repr"),next:function(){ -return fun.apply(self,seq.next()); +return MochiKit.Base.clone(hsl); +},toString:function(){ +return this.toRGBString(); +},repr:function(){ +var c=this.rgb; +var col=[c.r,c.g,c.b,c.a]; +return this.__class__.NAME+"("+col.join(", ")+")"; }}; -},chain:function(p,q){ -var self=MochiKit.Iter; -var m=MochiKit.Base; +MochiKit.Base.update(MochiKit.Color.Color,{fromRGB:function(red,_180,blue,_182){ +var _183=MochiKit.Color.Color; if(arguments.length==1){ -return self.iter(arguments[0]); -} -var _189=m.map(self.iter,arguments); -return {repr:function(){ -return "chain(...)"; -},toString:m.forwardCall("repr"),next:function(){ -while(_189.length>1){ -try{ -return _189[0].next(); -} -catch(e){ -if(e!=self.StopIteration){ -throw e; -} -_189.shift(); -} -} -if(_189.length==1){ -var arg=_189.shift(); -this.next=m.bind("next",arg); -return this.next(); -} -throw self.StopIteration; -}}; -},takewhile:function(pred,seq){ -var self=MochiKit.Iter; -seq=self.iter(seq); -return {repr:function(){ -return "takewhile(...)"; -},toString:MochiKit.Base.forwardCall("repr"),next:function(){ -var rval=seq.next(); -if(!pred(rval)){ -this.next=function(){ -throw self.StopIteration; -}; -this.next(); +var rgb=red; +red=rgb.r; +_180=rgb.g; +blue=rgb.b; +if(typeof (rgb.a)=="undefined"){ +_182=undefined; +}else{ +_182=rgb.a; } -return rval; -}}; -},dropwhile:function(pred,seq){ -seq=MochiKit.Iter.iter(seq); -var m=MochiKit.Base; -var bind=m.bind; -return {"repr":function(){ -return "dropwhile(...)"; -},"toString":m.forwardCall("repr"),"next":function(){ -while(true){ -var rval=seq.next(); -if(!pred(rval)){ -break; } +return new _183(red,_180,blue,_182); +},fromHSL:function(hue,_186,_187,_188){ +var m=MochiKit.Color; +return m.Color.fromRGB(m.hslToRGB.apply(m,arguments)); +},fromHSV:function(hue,_18b,_18c,_18d){ +var m=MochiKit.Color; +return m.Color.fromRGB(m.hsvToRGB.apply(m,arguments)); +},fromName:function(name){ +var _190=MochiKit.Color.Color; +if(name.charAt(0)=="\""){ +name=name.substr(1,name.length-2); } -this.next=bind("next",seq); -return rval; -}}; -},_tee:function(_194,sync,_196){ -sync.pos[_194]=-1; -var m=MochiKit.Base; -var _198=m.listMin; -return {repr:function(){ -return "tee("+_194+", ...)"; -},toString:m.forwardCall("repr"),next:function(){ -var rval; -var i=sync.pos[_194]; -if(i==sync.max){ -rval=_196.next(); -sync.deque.push(rval); -sync.max+=1; -sync.pos[_194]+=1; +var _191=_190._namedColors[name.toLowerCase()]; +if(typeof (_191)=="string"){ +return _190.fromHexString(_191); }else{ -rval=sync.deque[i-sync.min]; -sync.pos[_194]+=1; -if(i==sync.min&&_198(sync.pos)!=sync.min){ -sync.min+=1; -sync.deque.shift(); -} +if(name=="transparent"){ +return _190.transparentColor(); } -return rval; -}}; -},tee:function(_19b,n){ -var rval=[]; -var sync={"pos":[],"deque":[],"max":-1,"min":-1}; -if(arguments.length==1||typeof (n)=="undefined"||n===null){ -n=2; } -var self=MochiKit.Iter; -_19b=self.iter(_19b); -var _tee=self._tee; -for(var i=0;i_1a9){ +return _1a9; +}else{ +return v; } } -catch(e){ -if(e!=self.StopIteration){ -throw e; +},_hslValue:function(n1,n2,hue){ +if(hue>6){ +hue-=6; +}else{ +if(hue<0){ +hue+=6; } } -return x; -},range:function(){ -var _1ac=0; -var stop=0; -var step=1; -if(arguments.length==1){ -stop=arguments[0]; +var val; +if(hue<1){ +val=n1+(n2-n1)*hue; }else{ -if(arguments.length==2){ -_1ac=arguments[0]; -stop=arguments[1]; +if(hue<3){ +val=n2; }else{ -if(arguments.length==3){ -_1ac=arguments[0]; -stop=arguments[1]; -step=arguments[2]; +if(hue<4){ +val=n1+(n2-n1)*(4-hue); }else{ -throw new TypeError("range() takes 1, 2, or 3 arguments!"); -} -} -} -if(step===0){ -throw new TypeError("range() step must not be 0"); +val=n1; } -return {next:function(){ -if((step>0&&_1ac>=stop)||(step<0&&_1ac<=stop)){ -throw MochiKit.Iter.StopIteration; } -var rval=_1ac; -_1ac+=step; -return rval; -},repr:function(){ -return "range("+[_1ac,stop,step].join(", ")+")"; -},toString:MochiKit.Base.forwardCall("repr")}; -},sum:function(_1b0,_1b1){ -if(typeof (_1b1)=="undefined"||_1b1===null){ -_1b1=0; -} -var x=_1b1; -var self=MochiKit.Iter; -_1b0=self.iter(_1b0); -try{ -while(true){ -x+=_1b0.next(); -} -} -catch(e){ -if(e!=self.StopIteration){ -throw e; -} -} -return x; -},exhaust:function(_1b4){ -var self=MochiKit.Iter; -_1b4=self.iter(_1b4); -try{ -while(true){ -_1b4.next(); -} -} -catch(e){ -if(e!=self.StopIteration){ -throw e; -} -} -},forEach:function(_1b6,func,self){ -var m=MochiKit.Base; -if(arguments.length>2){ -func=m.bind(func,self); -} -if(m.isArrayLike(_1b6)){ -try{ -for(var i=0;i<_1b6.length;i++){ -func(_1b6[i]); -} -} -catch(e){ -if(e!=MochiKit.Iter.StopIteration){ -throw e; } +return val; +},hsvToRGB:function(hue,_1af,_1b0,_1b1){ +if(arguments.length==1){ +var hsv=hue; +hue=hsv.h; +_1af=hsv.s; +_1b0=hsv.v; +_1b1=hsv.a; } +var red; +var _1b4; +var blue; +if(_1af===0){ +red=_1b0; +_1b4=_1b0; +blue=_1b0; }else{ -self=MochiKit.Iter; -self.exhaust(self.imap(func,_1b6)); -} -},every:function(_1bb,func){ -var self=MochiKit.Iter; -try{ -self.ifilterfalse(func,_1bb).next(); -return false; -} -catch(e){ -if(e!=self.StopIteration){ -throw e; +var i=Math.floor(hue*6); +var f=(hue*6)-i; +var p=_1b0*(1-_1af); +var q=_1b0*(1-(_1af*f)); +var t=_1b0*(1-(_1af*(1-f))); +switch(i){ +case 1: +red=q; +_1b4=_1b0; +blue=p; +break; +case 2: +red=p; +_1b4=_1b0; +blue=t; +break; +case 3: +red=p; +_1b4=q; +blue=_1b0; +break; +case 4: +red=t; +_1b4=p; +blue=_1b0; +break; +case 5: +red=_1b0; +_1b4=p; +blue=q; +break; +case 6: +case 0: +red=_1b0; +_1b4=t; +blue=p; +break; } -return true; } -},sorted:function(_1be,cmp){ -var rval=MochiKit.Iter.list(_1be); +return {r:red,g:_1b4,b:blue,a:_1b1}; +},hslToRGB:function(hue,_1bc,_1bd,_1be){ if(arguments.length==1){ -cmp=MochiKit.Base.compare; -} -rval.sort(cmp); -return rval; -},reversed:function(_1c1){ -var rval=MochiKit.Iter.list(_1c1); -rval.reverse(); -return rval; -},some:function(_1c3,func){ -var self=MochiKit.Iter; -try{ -self.ifilter(func,_1c3).next(); -return true; -} -catch(e){ -if(e!=self.StopIteration){ -throw e; -} -return false; -} -},iextend:function(lst,_1c7){ -if(MochiKit.Base.isArrayLike(_1c7)){ -for(var i=0;i<_1c7.length;i++){ -lst.push(_1c7[i]); +var hsl=hue; +hue=hsl.h; +_1bc=hsl.s; +_1bd=hsl.l; +_1be=hsl.a; } +var red; +var _1c1; +var blue; +if(_1bc===0){ +red=_1bd; +_1c1=_1bd; +blue=_1bd; }else{ -var self=MochiKit.Iter; -_1c7=self.iter(_1c7); -try{ -while(true){ -lst.push(_1c7.next()); -} -} -catch(e){ -if(e!=self.StopIteration){ -throw e; -} -} +var m2; +if(_1bd<=0.5){ +m2=_1bd*(1+_1bc); +}else{ +m2=_1bd+_1bc-(_1bd*_1bc); } -return lst; -},groupby:function(_1ca,_1cb){ -var m=MochiKit.Base; -var self=MochiKit.Iter; -if(arguments.length<2){ -_1cb=m.operator.identity; +var m1=(2*_1bd)-m2; +var f=MochiKit.Color._hslValue; +var h6=hue*6; +red=f(m1,m2,h6+2); +_1c1=f(m1,m2,h6); +blue=f(m1,m2,h6-2); } -_1ca=self.iter(_1ca); -var pk=undefined; -var k=undefined; -var v; -function fetch(){ -v=_1ca.next(); -k=_1cb(v); +return {r:red,g:_1c1,b:blue,a:_1be}; +},rgbToHSV:function(red,_1c8,blue,_1ca){ +if(arguments.length==1){ +var rgb=red; +red=rgb.r; +_1c8=rgb.g; +blue=rgb.b; +_1ca=rgb.a; } -function eat(){ -var ret=v; -v=undefined; -return ret; +var max=Math.max(Math.max(red,_1c8),blue); +var min=Math.min(Math.min(red,_1c8),blue); +var hue; +var _1cf; +var _1d0=max; +if(min==max){ +hue=0; +_1cf=0; +}else{ +var _1d1=(max-min); +_1cf=_1d1/max; +if(red==max){ +hue=(_1c8-blue)/_1d1; +}else{ +if(_1c8==max){ +hue=2+((blue-red)/_1d1); +}else{ +hue=4+((red-_1c8)/_1d1); } -var _1d2=true; -var _1d3=m.compare; -return {repr:function(){ -return "groupby(...)"; -},next:function(){ -while(_1d3(k,pk)===0){ -fetch(); -if(_1d2){ -_1d2=false; -break; } +hue/=6; +if(hue<0){ +hue+=1; } -pk=k; -return [k,{next:function(){ -if(v==undefined){ -fetch(); +if(hue>1){ +hue-=1; } -if(_1d3(k,pk)!==0){ -throw self.StopIteration; } -return eat(); -}}]; -}}; -},groupby_as_array:function(_1d4,_1d5){ -var m=MochiKit.Base; -var self=MochiKit.Iter; -if(arguments.length<2){ -_1d5=m.operator.identity; +return {h:hue,s:_1cf,v:_1d0,a:_1ca}; +},rgbToHSL:function(red,_1d3,blue,_1d5){ +if(arguments.length==1){ +var rgb=red; +red=rgb.r; +_1d3=rgb.g; +blue=rgb.b; +_1d5=rgb.a; } -_1d4=self.iter(_1d4); -var _1d8=[]; -var _1d9=true; +var max=Math.max(red,Math.max(_1d3,blue)); +var min=Math.min(red,Math.min(_1d3,blue)); +var hue; var _1da; -var _1db=m.compare; -while(true){ -try{ -var _1dc=_1d4.next(); -var key=_1d5(_1dc); +var _1db=(max+min)/2; +var _1dc=max-min; +if(_1dc===0){ +hue=0; +_1da=0; +}else{ +if(_1db<=0.5){ +_1da=_1dc/(max+min); +}else{ +_1da=_1dc/(2-max-min); } -catch(e){ -if(e==self.StopIteration){ -break; +if(red==max){ +hue=(_1d3-blue)/_1dc; +}else{ +if(_1d3==max){ +hue=2+((blue-red)/_1dc); +}else{ +hue=4+((red-_1d3)/_1dc); } -throw e; } -if(_1d9||_1db(key,_1da)!==0){ -var _1de=[]; -_1d8.push([key,_1de]); +hue/=6; +if(hue<0){ +hue+=1; } -_1de.push(_1dc); -_1d9=false; -_1da=key; +if(hue>1){ +hue-=1; } -return _1d8; -},arrayLikeIter:function(_1df){ -var i=0; -return {repr:function(){ -return "arrayLikeIter(...)"; -},toString:MochiKit.Base.forwardCall("repr"),next:function(){ -if(i>=_1df.length){ -throw MochiKit.Iter.StopIteration; } -return _1df[i++]; -}}; -},hasIterateNext:function(_1e1){ -return (_1e1&&typeof (_1e1.iterateNext)=="function"); -},iterateNextIter:function(_1e2){ -return {repr:function(){ -return "iterateNextIter(...)"; -},toString:MochiKit.Base.forwardCall("repr"),next:function(){ -var rval=_1e2.iterateNext(); -if(rval===null||rval===undefined){ -throw MochiKit.Iter.StopIteration; +return {h:hue,s:_1da,l:_1db,a:_1d5}; +},toColorPart:function(num){ +num=Math.round(num); +var _1de=num.toString(16); +if(num<16){ +return "0"+_1de; } -return rval; -}}; -}}); -MochiKit.Iter.EXPORT_OK=["iteratorRegistry","arrayLikeIter","hasIterateNext","iterateNextIter"]; -MochiKit.Iter.EXPORT=["StopIteration","registerIteratorFactory","iter","count","cycle","repeat","next","izip","ifilter","ifilterfalse","islice","imap","applymap","chain","takewhile","dropwhile","tee","list","reduce","range","sum","exhaust","forEach","every","sorted","reversed","some","iextend","groupby","groupby_as_array"]; -MochiKit.Iter.__new__=function(){ +return _1de; +},__new__:function(){ var m=MochiKit.Base; -if(typeof (StopIteration)!="undefined"){ -this.StopIteration=StopIteration; -}else{ -this.StopIteration=new m.NamedError("StopIteration"); -} -this.iteratorRegistry=new m.AdapterRegistry(); -this.registerIteratorFactory("arrayLike",m.isArrayLike,this.arrayLikeIter); -this.registerIteratorFactory("iterateNext",this.hasIterateNext,this.iterateNextIter); -this.EXPORT_TAGS={":common":this.EXPORT,":all":m.concat(this.EXPORT,this.EXPORT_OK)}; -m.nameFunctions(this); +this.Color.fromRGBString=m.bind(this.Color._fromColorString,this.Color,"rgb","fromRGB",[1/255,1/255,1/255,1]); +this.Color.fromHSLString=m.bind(this.Color._fromColorString,this.Color,"hsl","fromHSL",[1/360,0.01,0.01,1]); +var _1e0=1/3; +var _1e1={black:[0,0,0],blue:[0,0,1],brown:[0.6,0.4,0.2],cyan:[0,1,1],darkGray:[_1e0,_1e0,_1e0],gray:[0.5,0.5,0.5],green:[0,1,0],lightGray:[2*_1e0,2*_1e0,2*_1e0],magenta:[1,0,1],orange:[1,0.5,0],purple:[0.5,0,0.5],red:[1,0,0],transparent:[0,0,0,0],white:[1,1,1],yellow:[1,1,0]}; +var _1e2=function(name,r,g,b,a){ +var rval=this.fromRGB(r,g,b,a); +this[name]=function(){ +return rval; }; -MochiKit.Iter.__new__(); -if(MochiKit.__export__){ -reduce=MochiKit.Iter.reduce; +return rval; +}; +for(var k in _1e1){ +var name=k+"Color"; +var _1eb=m.concat([_1e2,this.Color,name],_1e1[k]); +this.Color[name]=m.bind.apply(null,_1eb); +} +var _1ec=function(){ +for(var i=0;i=0){ var opt=elem.options[elem.selectedIndex]; @@ -1693,18 +1573,18 @@ if(h&&!h.match(/^[^>]+\svalue\s*=/i)){ v=opt.text; } } -_1ec.push(name); -_1ed.push(v); +_1f8.push(name); +_1f9.push(v); return null; } -_1ec.push(name); -_1ed.push(""); +_1f8.push(name); +_1f9.push(""); return null; }else{ var opts=elem.options; if(!opts.length){ -_1ec.push(name); -_1ed.push(""); +_1f8.push(name); +_1f9.push(""); return null; } for(var i=0;i]+\svalue\s*=/i)){ v=opt.text; } } -_1ec.push(name); -_1ed.push(v); +_1f8.push(name); +_1f9.push(v); } return null; } } -if(_1f2==="FORM"||_1f2==="P"||_1f2==="SPAN"||_1f2==="DIV"){ +if(_1fe==="FORM"||_1fe==="P"||_1fe==="SPAN"||_1fe==="DIV"){ return elem.childNodes; } -_1ec.push(name); -_1ed.push(elem.value||""); +_1f8.push(name); +_1f9.push(elem.value||""); return null; } return elem.childNodes; }); -return [_1ec,_1ed]; +return [_1f8,_1f9]; },withDocument:function(doc,func){ var self=MochiKit.DOM; -var _1fb=self._document; +var _207=self._document; var rval; try{ self._document=doc; rval=func(); } catch(e){ -self._document=_1fb; +self._document=_207; throw e; } -self._document=_1fb; +self._document=_207; return rval; -},registerDOMConverter:function(name,_1fe,wrap,_200){ -MochiKit.DOM.domConverters.register(name,_1fe,wrap,_200); +},registerDOMConverter:function(name,_20a,wrap,_20c){ +MochiKit.DOM.domConverters.register(name,_20a,wrap,_20c); },coerceToDOM:function(node,ctx){ var m=MochiKit.Base; var im=MochiKit.Iter; var self=MochiKit.DOM; if(im){ var iter=im.iter; -var _207=im.repeat; +var _213=im.repeat; var map=m.map; } -var _209=self.domConverters; -var _20a=arguments.callee; -var _20b=m.NotFound; +var _215=self.domConverters; +var _216=arguments.callee; +var _217=m.NotFound; while(true){ if(typeof (node)=="undefined"||node===null){ return null; @@ -1792,49 +1672,49 @@ node=node.apply(ctx,[ctx]); continue; } if(im){ -var _20c=null; +var _218=null; try{ -_20c=iter(node); +_218=iter(node); } catch(e){ } -if(_20c){ -return map(_20a,_20c,_207(ctx)); +if(_218){ +return map(_216,_218,_213(ctx)); } } try{ -node=_209.match(node,ctx); +node=_215.match(node,ctx); continue; } catch(e){ -if(e!=_20b){ +if(e!=_217){ throw e; } } return self._document.createTextNode(node.toString()); } return undefined; -},isChildNode:function(node,_20e){ +},isChildNode:function(node,_21a){ var self=MochiKit.DOM; if(typeof (node)=="string"){ node=self.getElement(node); } -if(typeof (_20e)=="string"){ -_20e=self.getElement(_20e); +if(typeof (_21a)=="string"){ +_21a=self.getElement(_21a); } -if(node===_20e){ +if(node===_21a){ return true; } while(node&&node.tagName.toUpperCase()!="BODY"){ node=node.parentNode; -if(node===_20e){ +if(node===_21a){ return true; } } return false; -},setNodeAttribute:function(node,attr,_212){ +},setNodeAttribute:function(node,attr,_21e){ var o={}; -o[attr]=_212; +o[attr]=_21e; try{ return MochiKit.DOM.updateNodeAttributes(node,o); } @@ -1843,11 +1723,11 @@ catch(e){ return null; },getNodeAttribute:function(node,attr){ var self=MochiKit.DOM; -var _217=self.attributeArray.renames[attr]; +var _223=self.attributeArray.renames[attr]; node=self.getElement(node); try{ -if(_217){ -return node[_217]; +if(_223){ +return node[_223]; } return node.getAttribute(attr); } @@ -1856,33 +1736,33 @@ catch(e){ return null; },removeNodeAttribute:function(node,attr){ var self=MochiKit.DOM; -var _21b=self.attributeArray.renames[attr]; +var _227=self.attributeArray.renames[attr]; node=self.getElement(node); try{ -if(_21b){ -return node[_21b]; +if(_227){ +return node[_227]; } return node.removeAttribute(attr); } catch(e){ } return null; -},updateNodeAttributes:function(node,_21d){ +},updateNodeAttributes:function(node,_229){ var elem=node; var self=MochiKit.DOM; if(typeof (node)=="string"){ elem=self.getElement(node); } -if(_21d){ -var _220=MochiKit.Base.updatetree; +if(_229){ +var _22c=MochiKit.Base.updatetree; if(self.attributeArray.compliant){ -for(var k in _21d){ -var v=_21d[k]; +for(var k in _229){ +var v=_229[k]; if(typeof (v)=="object"&&typeof (elem[k])=="object"){ if(k=="style"&&MochiKit.Style){ MochiKit.Style.setStyle(elem,v); }else{ -_220(elem[k],v); +_22c(elem[k],v); } }else{ if(k.substring(0,2)=="on"){ @@ -1896,21 +1776,21 @@ elem.setAttribute(k,v); } } }else{ -var _223=self.attributeArray.renames; -for(var k in _21d){ -v=_21d[k]; -var _224=_223[k]; +var _22f=self.attributeArray.renames; +for(var k in _229){ +v=_229[k]; +var _230=_22f[k]; if(k=="style"&&typeof (v)=="string"){ elem.style.cssText=v; }else{ -if(typeof (_224)=="string"){ -elem[_224]=v; +if(typeof (_230)=="string"){ +elem[_230]=v; }else{ if(typeof (elem[k])=="object"&&typeof (v)=="object"){ if(k=="style"&&MochiKit.Style){ MochiKit.Style.setStyle(elem,v); }else{ -_220(elem[k],v); +_22c(elem[k],v); } }else{ if(k.substring(0,2)=="on"){ @@ -1934,16 +1814,16 @@ var self=MochiKit.DOM; if(typeof (node)=="string"){ elem=self.getElement(node); } -var _228=[self.coerceToDOM(MochiKit.Base.extend(null,arguments,1),elem)]; -var _229=MochiKit.Base.concat; -while(_228.length){ -var n=_228.shift(); +var _234=[self.coerceToDOM(MochiKit.Base.extend(null,arguments,1),elem)]; +var _235=MochiKit.Base.concat; +while(_234.length){ +var n=_234.shift(); if(typeof (n)=="undefined"||n===null){ }else{ if(typeof (n.nodeType)=="number"){ elem.appendChild(n); }else{ -_228=_229(n,_228); +_234=_235(n,_234); } } } @@ -1954,32 +1834,32 @@ var self=MochiKit.DOM; if(typeof (node)=="string"){ elem=self.getElement(node); } -var _22e=[self.coerceToDOM(MochiKit.Base.extend(null,arguments,1),elem)]; -var _22f=elem.parentNode; -var _230=MochiKit.Base.concat; -while(_22e.length){ -var n=_22e.shift(); +var _23a=[self.coerceToDOM(MochiKit.Base.extend(null,arguments,1),elem)]; +var _23b=elem.parentNode; +var _23c=MochiKit.Base.concat; +while(_23a.length){ +var n=_23a.shift(); if(typeof (n)=="undefined"||n===null){ }else{ if(typeof (n.nodeType)=="number"){ -_22f.insertBefore(n,elem); +_23b.insertBefore(n,elem); }else{ -_22e=_230(n,_22e); +_23a=_23c(n,_23a); } } } -return _22f; +return _23b; },insertSiblingNodesAfter:function(node){ var elem=node; var self=MochiKit.DOM; if(typeof (node)=="string"){ elem=self.getElement(node); } -var _235=[self.coerceToDOM(MochiKit.Base.extend(null,arguments,1),elem)]; +var _241=[self.coerceToDOM(MochiKit.Base.extend(null,arguments,1),elem)]; if(elem.nextSibling){ -return self.insertSiblingNodesBefore(elem.nextSibling,_235); +return self.insertSiblingNodesBefore(elem.nextSibling,_241); }else{ -return self.appendChildNodes(elem.parentNode,_235); +return self.appendChildNodes(elem.parentNode,_241); } },replaceChildNodes:function(node){ var elem=node; @@ -1988,40 +1868,40 @@ if(typeof (node)=="string"){ elem=self.getElement(node); arguments[0]=elem; } -var _239; -while((_239=elem.firstChild)){ -elem.removeChild(_239); +var _245; +while((_245=elem.firstChild)){ +elem.removeChild(_245); } if(arguments.length<2){ return elem; }else{ return self.appendChildNodes.apply(this,arguments); } -},createDOM:function(name,_23b){ +},createDOM:function(name,_247){ var elem; var self=MochiKit.DOM; var m=MochiKit.Base; -if(typeof (_23b)=="string"||typeof (_23b)=="number"){ +if(typeof (_247)=="string"||typeof (_247)=="number"){ var args=m.extend([name,null],arguments,1); return arguments.callee.apply(this,args); } if(typeof (name)=="string"){ -var _240=self._xhtml; -if(_23b&&!self.attributeArray.compliant){ -var _241=""; -if("name" in _23b){ -_241+=" name=\""+self.escapeHTML(_23b.name)+"\""; +var _24c=self._xhtml; +if(_247&&!self.attributeArray.compliant){ +var _24d=""; +if("name" in _247){ +_24d+=" name=\""+self.escapeHTML(_247.name)+"\""; } -if(name=="input"&&"type" in _23b){ -_241+=" type=\""+self.escapeHTML(_23b.type)+"\""; +if(name=="input"&&"type" in _247){ +_24d+=" type=\""+self.escapeHTML(_247.type)+"\""; } -if(_241){ -name="<"+name+_241+">"; -_240=false; +if(_24d){ +name="<"+name+_24d+">"; +_24c=false; } } var d=self._document; -if(_240&&d===document){ +if(_24c&&d===document){ elem=d.createElementNS("http://www.w3.org/1999/xhtml",name); }else{ elem=d.createElement(name); @@ -2029,8 +1909,8 @@ elem=d.createElement(name); }else{ elem=name; } -if(_23b){ -self.updateNodeAttributes(elem,_23b); +if(_247){ +self.updateNodeAttributes(elem,_247); } if(arguments.length<=2){ return elem; @@ -2048,12 +1928,12 @@ return e; },swapDOM:function(dest,src){ var self=MochiKit.DOM; dest=self.getElement(dest); -var _249=dest.parentNode; +var _255=dest.parentNode; if(src){ src=self.getElement(src); -_249.replaceChild(src,dest); +_255.replaceChild(src,dest); }else{ -_249.removeChild(dest); +_255.removeChild(dest); } return src; },getElement:function(id){ @@ -2063,40 +1943,40 @@ return ((typeof (id)=="string")?self._document.getElementById(id):id); }else{ return MochiKit.Base.map(self.getElement,arguments); } -},getElementsByTagAndClassName:function(_24c,_24d,_24e){ +},getElementsByTagAndClassName:function(_258,_259,_25a){ var self=MochiKit.DOM; -if(typeof (_24c)=="undefined"||_24c===null){ -_24c="*"; +if(typeof (_258)=="undefined"||_258===null){ +_258="*"; } -if(typeof (_24e)=="undefined"||_24e===null){ -_24e=self._document; +if(typeof (_25a)=="undefined"||_25a===null){ +_25a=self._document; } -_24e=self.getElement(_24e); -var _250=(_24e.getElementsByTagName(_24c)||self._document.all); -if(typeof (_24d)=="undefined"||_24d===null){ -return MochiKit.Base.extend(null,_250); +_25a=self.getElement(_25a); +var _25c=(_25a.getElementsByTagName(_258)||self._document.all); +if(typeof (_259)=="undefined"||_259===null){ +return MochiKit.Base.extend(null,_25c); } -var _251=[]; -for(var i=0;i<_250.length;i++){ -var _253=_250[i]; -var cls=_253.className; +var _25d=[]; +for(var i=0;i<_25c.length;i++){ +var _25f=_25c[i]; +var cls=_25f.className; if(!cls){ continue; } -var _255=cls.split(" "); -for(var j=0;j<_255.length;j++){ -if(_255[j]==_24d){ -_251.push(_253); +var _261=cls.split(" "); +for(var j=0;j<_261.length;j++){ +if(_261[j]==_259){ +_25d.push(_25f); break; } } } -return _251; +return _25d; },_newCallStack:function(path,once){ var rval=function(){ -var _25a=arguments.callee.callStack; -for(var i=0;i<_25a.length;i++){ -if(_25a[i].apply(this,arguments)===false){ +var _266=arguments.callee.callStack; +for(var i=0;i<_266.length;i++){ +if(_266[i].apply(this,arguments)===false){ break; } } @@ -2110,102 +1990,102 @@ catch(e){ }; rval.callStack=[]; return rval; -},addToCallStack:function(_25c,path,func,once){ +},addToCallStack:function(_268,path,func,once){ var self=MochiKit.DOM; -var _261=_25c[path]; -var _262=_261; -if(!(typeof (_261)=="function"&&typeof (_261.callStack)=="object"&&_261.callStack!==null)){ -_262=self._newCallStack(path,once); -if(typeof (_261)=="function"){ -_262.callStack.push(_261); +var _26d=_268[path]; +var _26e=_26d; +if(!(typeof (_26d)=="function"&&typeof (_26d.callStack)=="object"&&_26d.callStack!==null)){ +_26e=self._newCallStack(path,once); +if(typeof (_26d)=="function"){ +_26e.callStack.push(_26d); } -_25c[path]=_262; +_268[path]=_26e; } -_262.callStack.push(func); +_26e.callStack.push(func); },addLoadEvent:function(func){ var self=MochiKit.DOM; self.addToCallStack(self._window,"onload",func,true); -},focusOnLoad:function(_265){ +},focusOnLoad:function(_271){ var self=MochiKit.DOM; self.addLoadEvent(function(){ -_265=self.getElement(_265); -if(_265){ -_265.focus(); +_271=self.getElement(_271); +if(_271){ +_271.focus(); } }); -},setElementClass:function(_267,_268){ +},setElementClass:function(_273,_274){ var self=MochiKit.DOM; -var obj=self.getElement(_267); +var obj=self.getElement(_273); if(self.attributeArray.compliant){ -obj.setAttribute("class",_268); +obj.setAttribute("class",_274); }else{ -obj.setAttribute("className",_268); +obj.setAttribute("className",_274); } -},toggleElementClass:function(_26b){ +},toggleElementClass:function(_277){ var self=MochiKit.DOM; for(var i=1;i"); -_28e.push(""); -var _298=dom.childNodes; -for(i=_298.length-1;i>=0;i--){ -_28e.push(_298[i]); +_29a.push(""); +var _2a4=dom.childNodes; +for(i=_2a4.length-1;i>=0;i--){ +_29a.push(_2a4[i]); } }else{ lst.push("/>"); } }else{ if(dom.nodeType==3){ -lst.push(_290(dom.nodeValue)); +lst.push(_29c(dom.nodeValue)); } } } } return lst; -},scrapeText:function(node,_29a){ +},scrapeText:function(node,_2a6){ var rval=[]; (function(node){ var cn=node.childNodes; @@ -2274,103 +2154,103 @@ for(var i=0;i0){ -var _2c1=m.filter; -_2c0=function(node){ -return _2c1(_2c0.ignoreAttrFilter,node.attributes); -}; -_2c0.ignoreAttr={}; -var _2c3=_2bf.attributes; -var _2c4=_2c0.ignoreAttr; -for(var i=0;i<_2c3.length;i++){ -var a=_2c3[i]; -_2c4[a.name]=a.value; -} -_2c0.ignoreAttrFilter=function(a){ -return (_2c0.ignoreAttr[a.name]!=a.value); -}; -_2c0.compliant=false; -_2c0.renames={"class":"className","checked":"defaultChecked","usemap":"useMap","for":"htmlFor","readonly":"readOnly","colspan":"colSpan","bgcolor":"bgColor","cellspacing":"cellSpacing","cellpadding":"cellPadding"}; -}else{ -_2c0=function(node){ +var _2cb=this._document.createElement("span"); +var _2cc; +if(_2cb&&_2cb.attributes&&_2cb.attributes.length>0){ +var _2cd=m.filter; +_2cc=function(node){ +return _2cd(_2cc.ignoreAttrFilter,node.attributes); +}; +_2cc.ignoreAttr={}; +var _2cf=_2cb.attributes; +var _2d0=_2cc.ignoreAttr; +for(var i=0;i<_2cf.length;i++){ +var a=_2cf[i]; +_2d0[a.name]=a.value; +} +_2cc.ignoreAttrFilter=function(a){ +return (_2cc.ignoreAttr[a.name]!=a.value); +}; +_2cc.compliant=false; +_2cc.renames={"class":"className","checked":"defaultChecked","usemap":"useMap","for":"htmlFor","readonly":"readOnly","colspan":"colSpan","bgcolor":"bgColor","cellspacing":"cellSpacing","cellpadding":"cellPadding"}; +}else{ +_2cc=function(node){ return node.attributes; }; -_2c0.compliant=true; -_2c0.renames={}; +_2cc.compliant=true; +_2cc.renames={}; } -this.attributeArray=_2c0; -var _2c9=function(_2ca,arr){ -var _2cc=arr[1].split("."); +this.attributeArray=_2cc; +var _2d5=function(_2d6,arr){ +var _2d8=arr[1].split("."); var str=""; var obj={}; -str+="if (!MochiKit."+_2cc[1]+") { throw new Error(\""; +str+="if (!MochiKit."+_2d8[1]+") { throw new Error(\""; str+="This function has been deprecated and depends on MochiKit."; -str+=_2cc[1]+".\");}"; -str+="return MochiKit."+_2cc[1]+"."+arr[0]; +str+=_2d8[1]+".\");}"; +str+="return MochiKit."+_2d8[1]+"."+arr[0]; str+=".apply(this, arguments);"; -obj[_2cc[2]]=new Function(str); -MochiKit.Base.update(MochiKit[_2ca],obj); +obj[_2d8[2]]=new Function(str); +MochiKit.Base.update(MochiKit[_2d6],obj); }; for(var i;i0.5; -},isDark:function(){ -return (!this.isLight()); -},toHSLString:function(){ -var c=this.asHSL(); -var ccc=MochiKit.Color.clampColorComponent; -var rval=this._hslString; -if(!rval){ -var mid=(ccc(c.h,360).toFixed(0)+","+ccc(c.s,100).toPrecision(4)+"%"+","+ccc(c.l,100).toPrecision(4)+"%"); -var a=c.a; -if(a>=1){ -a=1; -rval="hsl("+mid+")"; -}else{ -if(a<=0){ -a=0; -} -rval="hsla("+mid+","+a+")"; -} -this._hslString=rval; -} -return rval; -},toRGBString:function(){ -var c=this.rgb; -var ccc=MochiKit.Color.clampColorComponent; -var rval=this._rgbString; -if(!rval){ -var mid=(ccc(c.r,255).toFixed(0)+","+ccc(c.g,255).toFixed(0)+","+ccc(c.b,255).toFixed(0)); -if(c.a!=1){ -rval="rgba("+mid+","+c.a+")"; -}else{ -rval="rgb("+mid+")"; -} -this._rgbString=rval; -} -return rval; -},asRGB:function(){ -return MochiKit.Base.clone(this.rgb); -},toHexString:function(){ -var m=MochiKit.Color; -var c=this.rgb; -var ccc=MochiKit.Color.clampColorComponent; -var rval=this._hexString; -if(!rval){ -rval=("#"+m.toColorPart(ccc(c.r,255))+m.toColorPart(ccc(c.g,255))+m.toColorPart(ccc(c.b,255))); -this._hexString=rval; -} -return rval; -},asHSV:function(){ -var hsv=this.hsv; -var c=this.rgb; -if(typeof (hsv)=="undefined"||hsv===null){ -hsv=MochiKit.Color.rgbToHSV(this.rgb); -this.hsv=hsv; -} -return MochiKit.Base.clone(hsv); -},asHSL:function(){ -var hsl=this.hsl; -var c=this.rgb; -if(typeof (hsl)=="undefined"||hsl===null){ -hsl=MochiKit.Color.rgbToHSL(this.rgb); -this.hsl=hsl; -} -return MochiKit.Base.clone(hsl); -},toString:function(){ -return this.toRGBString(); -},repr:function(){ -var c=this.rgb; -var col=[c.r,c.g,c.b,c.a]; -return this.__class__.NAME+"("+col.join(", ")+")"; -}}; -MochiKit.Base.update(MochiKit.Color.Color,{fromRGB:function(red,_344,blue,_346){ -var _347=MochiKit.Color.Color; -if(arguments.length==1){ -var rgb=red; -red=rgb.r; -_344=rgb.g; -blue=rgb.b; -if(typeof (rgb.a)=="undefined"){ -_346=undefined; -}else{ -_346=rgb.a; -} -} -return new _347(red,_344,blue,_346); -},fromHSL:function(hue,_34a,_34b,_34c){ -var m=MochiKit.Color; -return m.Color.fromRGB(m.hslToRGB.apply(m,arguments)); -},fromHSV:function(hue,_34f,_350,_351){ -var m=MochiKit.Color; -return m.Color.fromRGB(m.hsvToRGB.apply(m,arguments)); -},fromName:function(name){ -var _354=MochiKit.Color.Color; -if(name.charAt(0)=="\""){ -name=name.substr(1,name.length-2); -} -var _355=_354._namedColors[name.toLowerCase()]; -if(typeof (_355)=="string"){ -return _354.fromHexString(_355); -}else{ -if(name=="transparent"){ -return _354.transparentColor(); -} -} -return null; -},fromString:function(_356){ -var self=MochiKit.Color.Color; -var _358=_356.substr(0,3); -if(_358=="rgb"){ -return self.fromRGBString(_356); -}else{ -if(_358=="hsl"){ -return self.fromHSLString(_356); -}else{ -if(_356.charAt(0)=="#"){ -return self.fromHexString(_356); -} -} -} -return self.fromName(_356); -},fromHexString:function(_359){ -if(_359.charAt(0)=="#"){ -_359=_359.substring(1); -} -var _35a=[]; -var i,hex; -if(_359.length==3){ -for(i=0;i<3;i++){ -hex=_359.substr(i,1); -_35a.push(parseInt(hex+hex,16)/255); -} -}else{ -for(i=0;i<6;i+=2){ -hex=_359.substr(i,2); -_35a.push(parseInt(hex,16)/255); -} -} -var _35d=MochiKit.Color.Color; -return _35d.fromRGB.apply(_35d,_35a); -},_fromColorString:function(pre,_35f,_360,_361){ -if(_361.indexOf(pre)===0){ -_361=_361.substring(_361.indexOf("(",3)+1,_361.length-1); -} -var _362=_361.split(/\s*,\s*/); -var _363=[]; -for(var i=0;i<_362.length;i++){ -var c=_362[i]; -var val; -var _367=c.substring(c.length-3); -if(c.charAt(c.length-1)=="%"){ -val=0.01*parseFloat(c.substring(0,c.length-1)); -}else{ -if(_367=="deg"){ -val=parseFloat(c)/360; -}else{ -if(_367=="rad"){ -val=parseFloat(c)/(Math.PI*2); -}else{ -val=_360[i]*parseFloat(c); -} -} -} -_363.push(val); -} -return this[_35f].apply(this,_363); -},fromComputedStyle:function(elem,_369){ -var d=MochiKit.DOM; -var cls=MochiKit.Color.Color; -for(elem=d.getElement(elem);elem;elem=elem.parentNode){ -var _36c=MochiKit.Style.getStyle.apply(d,arguments); -if(!_36c){ -continue; -} -var _36d=cls.fromString(_36c); -if(!_36d){ -break; -} -if(_36d.asRGB().a>0){ -return _36d; -} -} -return null; -},fromBackground:function(elem){ -var cls=MochiKit.Color.Color; -return cls.fromComputedStyle(elem,"backgroundColor","background-color")||cls.whiteColor(); -},fromText:function(elem){ -var cls=MochiKit.Color.Color; -return cls.fromComputedStyle(elem,"color","color")||cls.blackColor(); -},namedColors:function(){ -return MochiKit.Base.clone(MochiKit.Color.Color._namedColors); -}}); -MochiKit.Base.update(MochiKit.Color,{clampColorComponent:function(v,_373){ -v*=_373; -if(v<0){ -return 0; -}else{ -if(v>_373){ -return _373; -}else{ -return v; -} -} -},_hslValue:function(n1,n2,hue){ -if(hue>6){ -hue-=6; -}else{ -if(hue<0){ -hue+=6; -} -} -var val; -if(hue<1){ -val=n1+(n2-n1)*hue; -}else{ -if(hue<3){ -val=n2; -}else{ -if(hue<4){ -val=n1+(n2-n1)*(4-hue); -}else{ -val=n1; -} -} -} -return val; -},hsvToRGB:function(hue,_379,_37a,_37b){ -if(arguments.length==1){ -var hsv=hue; -hue=hsv.h; -_379=hsv.s; -_37a=hsv.v; -_37b=hsv.a; -} -var red; -var _37e; -var blue; -if(_379===0){ -red=_37a; -_37e=_37a; -blue=_37a; -}else{ -var i=Math.floor(hue*6); -var f=(hue*6)-i; -var p=_37a*(1-_379); -var q=_37a*(1-(_379*f)); -var t=_37a*(1-(_379*(1-f))); -switch(i){ -case 1: -red=q; -_37e=_37a; -blue=p; -break; -case 2: -red=p; -_37e=_37a; -blue=t; -break; -case 3: -red=p; -_37e=q; -blue=_37a; -break; -case 4: -red=t; -_37e=p; -blue=_37a; -break; -case 5: -red=_37a; -_37e=p; -blue=q; -break; -case 6: -case 0: -red=_37a; -_37e=t; -blue=p; -break; -} -} -return {r:red,g:_37e,b:blue,a:_37b}; -},hslToRGB:function(hue,_386,_387,_388){ -if(arguments.length==1){ -var hsl=hue; -hue=hsl.h; -_386=hsl.s; -_387=hsl.l; -_388=hsl.a; +return undefined; } -var red; -var _38b; -var blue; -if(_386===0){ -red=_387; -_38b=_387; -blue=_387; +var c=new self.Coordinates(0,0); +var box=null; +var _2f6=null; +var d=MochiKit.DOM._document; +var de=d.documentElement; +var b=d.body; +if(!elem.parentNode&&elem.x&&elem.y){ +c.x+=elem.x||0; +c.y+=elem.y||0; }else{ -var m2; -if(_387<=0.5){ -m2=_387*(1+_386); +if(elem.getBoundingClientRect){ +box=elem.getBoundingClientRect(); +c.x+=box.left+(de.scrollLeft||b.scrollLeft)-(de.clientLeft||0); +c.y+=box.top+(de.scrollTop||b.scrollTop)-(de.clientTop||0); }else{ -m2=_387+_386-(_387*_386); +if(elem.offsetParent){ +c.x+=elem.offsetLeft; +c.y+=elem.offsetTop; +_2f6=elem.offsetParent; +if(_2f6!=elem){ +while(_2f6){ +c.x+=_2f6.offsetLeft; +c.y+=_2f6.offsetTop; +_2f6=_2f6.offsetParent; } -var m1=(2*_387)-m2; -var f=MochiKit.Color._hslValue; -var h6=hue*6; -red=f(m1,m2,h6+2); -_38b=f(m1,m2,h6); -blue=f(m1,m2,h6-2); } -return {r:red,g:_38b,b:blue,a:_388}; -},rgbToHSV:function(red,_392,blue,_394){ -if(arguments.length==1){ -var rgb=red; -red=rgb.r; -_392=rgb.g; -blue=rgb.b; -_394=rgb.a; +var ua=navigator.userAgent.toLowerCase(); +if((typeof (opera)!="undefined"&&parseFloat(opera.version())<9)||(ua.indexOf("AppleWebKit")!=-1&&self.getStyle(elem,"position")=="absolute")){ +c.x-=b.offsetLeft; +c.y-=b.offsetTop; } -var max=Math.max(Math.max(red,_392),blue); -var min=Math.min(Math.min(red,_392),blue); -var hue; -var _399; -var _39a=max; -if(min==max){ -hue=0; -_399=0; -}else{ -var _39b=(max-min); -_399=_39b/max; -if(red==max){ -hue=(_392-blue)/_39b; +} +} +} +if(typeof (_2f1)!="undefined"){ +_2f1=arguments.callee(_2f1); +if(_2f1){ +c.x-=(_2f1.x||0); +c.y-=(_2f1.y||0); +} +} +if(elem.parentNode){ +_2f6=elem.parentNode; }else{ -if(_392==max){ -hue=2+((blue-red)/_39b); +_2f6=null; +} +while(_2f6){ +var _2fb=_2f6.tagName.toUpperCase(); +if(_2fb==="BODY"||_2fb==="HTML"){ +break; +} +var disp=self.getStyle(_2f6,"display"); +if(disp!="inline"&&disp!="table-row"){ +c.x-=_2f6.scrollLeft; +c.y-=_2f6.scrollTop; +} +if(_2f6.parentNode){ +_2f6=_2f6.parentNode; }else{ -hue=4+((red-_392)/_39b); +_2f6=null; } } -hue/=6; -if(hue<0){ -hue+=1; +return c; +},setElementPosition:function(elem,_2fe,_2ff){ +elem=MochiKit.DOM.getElement(elem); +if(typeof (_2ff)=="undefined"){ +_2ff="px"; } -if(hue>1){ -hue-=1; +var _300={}; +var _301=MochiKit.Base.isUndefinedOrNull; +if(!_301(_2fe.x)){ +_300["left"]=_2fe.x+_2ff; } +if(!_301(_2fe.y)){ +_300["top"]=_2fe.y+_2ff; } -return {h:hue,s:_399,v:_39a,a:_394}; -},rgbToHSL:function(red,_39d,blue,_39f){ -if(arguments.length==1){ -var rgb=red; -red=rgb.r; -_39d=rgb.g; -blue=rgb.b; -_39f=rgb.a; +MochiKit.DOM.updateNodeAttributes(elem,{"style":_300}); +},getElementDimensions:function(elem){ +var self=MochiKit.Style; +var dom=MochiKit.DOM; +if(typeof (elem.w)=="number"||typeof (elem.h)=="number"){ +return new self.Dimensions(elem.w||0,elem.h||0); } -var max=Math.max(red,Math.max(_39d,blue)); -var min=Math.min(red,Math.min(_39d,blue)); -var hue; -var _3a4; -var _3a5=(max+min)/2; -var _3a6=max-min; -if(_3a6===0){ -hue=0; -_3a4=0; -}else{ -if(_3a5<=0.5){ -_3a4=_3a6/(max+min); -}else{ -_3a4=_3a6/(2-max-min); +elem=dom.getElement(elem); +if(!elem){ +return undefined; } -if(red==max){ -hue=(_39d-blue)/_3a6; -}else{ -if(_39d==max){ -hue=2+((blue-red)/_3a6); -}else{ -hue=4+((red-_39d)/_3a6); +var disp=self.getStyle(elem,"display"); +if(disp!="none"&&disp!==""&&typeof (disp)!="undefined"){ +return new self.Dimensions(elem.offsetWidth||0,elem.offsetHeight||0); } +var s=elem.style; +var _307=s.visibility; +var _308=s.position; +s.visibility="hidden"; +s.position="absolute"; +s.display=""; +var _309=elem.offsetWidth; +var _30a=elem.offsetHeight; +s.display="none"; +s.position=_308; +s.visibility=_307; +return new self.Dimensions(_309,_30a); +},setElementDimensions:function(elem,_30c,_30d){ +elem=MochiKit.DOM.getElement(elem); +if(typeof (_30d)=="undefined"){ +_30d="px"; } -hue/=6; -if(hue<0){ -hue+=1; +var _30e={}; +var _30f=MochiKit.Base.isUndefinedOrNull; +if(!_30f(_30c.w)){ +_30e["width"]=_30c.w+_30d; } -if(hue>1){ -hue-=1; +if(!_30f(_30c.h)){ +_30e["height"]=_30c.h+_30d; } +MochiKit.DOM.updateNodeAttributes(elem,{"style":_30e}); +},setDisplayForElement:function(_310,_311){ +var _312=MochiKit.Base.extend(null,arguments,1); +var _313=MochiKit.DOM.getElement; +for(var i=0;i<_312.length;i++){ +_311=_313(_312[i]); +if(_311){ +_311.style.display=_310; } -return {h:hue,s:_3a4,l:_3a5,a:_39f}; -},toColorPart:function(num){ -num=Math.round(num); -var _3a8=num.toString(16); -if(num<16){ -return "0"+_3a8; } -return _3a8; -},__new__:function(){ -var m=MochiKit.Base; -this.Color.fromRGBString=m.bind(this.Color._fromColorString,this.Color,"rgb","fromRGB",[1/255,1/255,1/255,1]); -this.Color.fromHSLString=m.bind(this.Color._fromColorString,this.Color,"hsl","fromHSL",[1/360,0.01,0.01,1]); -var _3aa=1/3; -var _3ab={black:[0,0,0],blue:[0,0,1],brown:[0.6,0.4,0.2],cyan:[0,1,1],darkGray:[_3aa,_3aa,_3aa],gray:[0.5,0.5,0.5],green:[0,1,0],lightGray:[2*_3aa,2*_3aa,2*_3aa],magenta:[1,0,1],orange:[1,0.5,0],purple:[0.5,0,0.5],red:[1,0,0],transparent:[0,0,0,0],white:[1,1,1],yellow:[1,1,0]}; -var _3ac=function(name,r,g,b,a){ -var rval=this.fromRGB(r,g,b,a); -this[name]=function(){ -return rval; -}; -return rval; -}; -for(var k in _3ab){ -var name=k+"Color"; -var _3b5=m.concat([_3ac,this.Color,name],_3ab[k]); -this.Color[name]=m.bind.apply(null,_3b5); +},getViewportDimensions:function(){ +var d=new MochiKit.Style.Dimensions(); +var w=MochiKit.DOM._window; +var b=MochiKit.DOM._document.body; +if(w.innerWidth){ +d.w=w.innerWidth; +d.h=w.innerHeight; +}else{ +if(b.parentElement.clientWidth){ +d.w=b.parentElement.clientWidth; +d.h=b.parentElement.clientHeight; +}else{ +if(b&&b.clientWidth){ +d.w=b.clientWidth; +d.h=b.clientHeight; } -var _3b6=function(){ -for(var i=0;i1){ var src=MochiKit.DOM.getElement(arguments[0]); var sig=arguments[1]; var obj=arguments[2]; var func=arguments[3]; -for(var i=_3f8.length-1;i>=0;i--){ -var o=_3f8[i]; +for(var i=_35a.length-1;i>=0;i--){ +var o=_35a[i]; if(o.source===src&&o.signal===sig&&o.objOrFunc===obj&&o.funcOrStr===func){ self._disconnect(o); if(!self._lock){ -_3f8.splice(i,1); +_35a.splice(i,1); }else{ self._dirty=true; } @@ -3722,11 +3072,11 @@ return true; } } }else{ -var idx=m.findIdentical(_3f8,_3f6); +var idx=m.findIdentical(_35a,_358); if(idx>=0){ -self._disconnect(_3f6); +self._disconnect(_358); if(!self._lock){ -_3f8.splice(idx,1); +_35a.splice(idx,1); }else{ self._dirty=true; } @@ -3734,548 +3084,243 @@ return true; } } return false; -},disconnectAllTo:function(_401,_402){ +},disconnectAllTo:function(_363,_364){ var self=MochiKit.Signal; -var _404=self._observers; -var _405=self._disconnect; -var _406=self._lock; -var _407=self._dirty; -if(typeof (_402)==="undefined"){ -_402=null; +var _366=self._observers; +var _367=self._disconnect; +var _368=self._lock; +var _369=self._dirty; +if(typeof (_364)==="undefined"){ +_364=null; } -for(var i=_404.length-1;i>=0;i--){ -var _409=_404[i]; -if(_409.objOrFunc===_401&&(_402===null||_409.funcOrStr===_402)){ -_405(_409); -if(_406){ -_407=true; +for(var i=_366.length-1;i>=0;i--){ +var _36b=_366[i]; +if(_36b.objOrFunc===_363&&(_364===null||_36b.funcOrStr===_364)){ +_367(_36b); +if(_368){ +_369=true; }else{ -_404.splice(i,1); +_366.splice(i,1); } } } -self._dirty=_407; +self._dirty=_369; },disconnectAll:function(src,sig){ src=MochiKit.DOM.getElement(src); var m=MochiKit.Base; -var _40d=m.flattenArguments(m.extend(null,arguments,1)); +var _36f=m.flattenArguments(m.extend(null,arguments,1)); var self=MochiKit.Signal; -var _40f=self._disconnect; -var _410=self._observers; -var i,_412; -var _413=self._lock; -var _414=self._dirty; -if(_40d.length===0){ -for(i=_410.length-1;i>=0;i--){ -_412=_410[i]; -if(_412.source===src){ -_40f(_412); -if(!_413){ -_410.splice(i,1); +var _371=self._disconnect; +var _372=self._observers; +var i,_374; +var _375=self._lock; +var _376=self._dirty; +if(_36f.length===0){ +for(i=_372.length-1;i>=0;i--){ +_374=_372[i]; +if(_374.source===src){ +_371(_374); +if(!_375){ +_372.splice(i,1); }else{ -_414=true; +_376=true; } } } }else{ var sigs={}; -for(i=0;i<_40d.length;i++){ -sigs[_40d[i]]=true; +for(i=0;i<_36f.length;i++){ +sigs[_36f[i]]=true; } -for(i=_410.length-1;i>=0;i--){ -_412=_410[i]; -if(_412.source===src&&_412.signal in sigs){ -_40f(_412); -if(!_413){ -_410.splice(i,1); +for(i=_372.length-1;i>=0;i--){ +_374=_372[i]; +if(_374.source===src&&_374.signal in sigs){ +_371(_374); +if(!_375){ +_372.splice(i,1); }else{ -_414=true; +_376=true; } } } } -self._dirty=_414; +self._dirty=_376; },signal:function(src,sig){ var self=MochiKit.Signal; -var _419=self._observers; +var _37b=self._observers; src=MochiKit.DOM.getElement(src); var args=MochiKit.Base.extend(null,arguments,2); -var _41b=[]; +var _37d=[]; self._lock=true; -for(var i=0;i<_419.length;i++){ -var _41d=_419[i]; -if(_41d.source===src&&_41d.signal===sig){ +for(var i=0;i<_37b.length;i++){ +var _37f=_37b[i]; +if(_37f.source===src&&_37f.signal===sig){ try{ -_41d.listener.apply(src,args); +_37f.listener.apply(src,args); } catch(e){ -_41b.push(e); +_37d.push(e); } } } self._lock=false; if(self._dirty){ self._dirty=false; -for(var i=_419.length-1;i>=0;i--){ -if(!_419[i].connected){ -_419.splice(i,1); +for(var i=_37b.length-1;i>=0;i--){ +if(!_37b[i].connected){ +_37b.splice(i,1); } } } -if(_41b.length==1){ -throw _41b[0]; +if(_37d.length==1){ +throw _37d[0]; }else{ -if(_41b.length>1){ +if(_37d.length>1){ var e=new Error("Multiple errors thrown in handling 'sig', see errors property"); -e.errors=_41b; +e.errors=_37d; throw e; } } }}); MochiKit.Signal.EXPORT_OK=[]; -MochiKit.Signal.EXPORT=["connect","disconnect","signal","disconnectAll","disconnectAllTo"]; -MochiKit.Signal.__new__=function(win){ -var m=MochiKit.Base; -this._document=document; -this._window=win; -this._lock=false; -this._dirty=false; -try{ -this.connect(window,"onunload",this._unloadCache); -} -catch(e){ -} -this.EXPORT_TAGS={":common":this.EXPORT,":all":m.concat(this.EXPORT,this.EXPORT_OK)}; -m.nameFunctions(this); -}; -MochiKit.Signal.__new__(this); -if(MochiKit.__export__){ -connect=MochiKit.Signal.connect; -disconnect=MochiKit.Signal.disconnect; -disconnectAll=MochiKit.Signal.disconnectAll; -signal=MochiKit.Signal.signal; -} -MochiKit.Base._exportSymbols(this,MochiKit.Signal); - - -/*** - - PlotKit.PlotKit 0.9.1 : PACKED VERSION - - THIS FILE IS AUTOMATICALLY GENERATED. If creating patches, please - diff against the source tree, not this file. - - For more information, . - - Copyright (c) 2006. Alastair Tse. - -***/ - -try{ -if(typeof (MochiKit.Base)=="undefined"||typeof (MochiKit.DOM)=="undefined"||typeof (MochiKit.Color)=="undefined"){ -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={}; -} -PlotKit.NAME="PlotKit"; -PlotKit.VERSION="0.8"; -PlotKit.__repr__=function(){ -return "["+this.NAME+" "+this.VERSION+"]"; -}; -PlotKit.toString=function(){ -return this.__repr__(); -}; -if(typeof (PlotKit.Base)=="undefined"){ -PlotKit.Base={}; -} -PlotKit.Base.NAME="PlotKit.Base"; -PlotKit.Base.VERSION=PlotKit.VERSION; -PlotKit.Base.__repr__=function(){ -return "["+this.NAME+" "+this.VERSION+"]"; -}; -PlotKit.Base.toString=function(){ -return this.__repr__(); -}; -PlotKit.Base.usingPrototype=function(){ -try{ -return (typeof (Object.extend)=="function"); -} -catch(e){ -return false; -} -}; -MochiKit.Base.update(PlotKit.Base,{collapse:function(_1){ -var m=MochiKit.Base; -var _3=new Array(); -for(var i=0;i<_1.length;i++){ -_3=m.concat(_3,_1[i]); -} -if(PlotKit.Base.usingPrototype()){ -delete _3.extend; -delete _3.from; -delete _3.inspect; -} -return _3; -},uniq:function(_5){ -var m=MochiKit.Base; -if(!m.isArrayLike(_5)||(_5.length<1)){ -return new Array(); -} -var _6=new Array(); -var _7=_5[0]; -_6.push(_5[0]); -for(var i=1;i<_5.length;i++){ -if(m.compare(_5[i],_7)!=0){ -_7=_5[i]; -_6.push(_5[i]); -} -} -return _6; -},palette:function(_8,_9,_10,_11){ -var _12=MochiKit.Base.isUndefinedOrNull; -var _13=new Array(); -if(_12(_11)){ -_11=0.1; -} -if(_12(_10)){ -_10=0.4; -} -if(_12(_9)){ -_9=-0.2; -} -var _14=_9; -while(_14<=_10){ -_13.push(_14); -_14+=_11; -} -var _15=function(_16,_17){ -return _16.lighterColorWithLevel(_17); -}; -return MochiKit.Base.map(partial(_15,_8),_13); -},excanvasSupported:function(){ -if(/MSIE/.test(navigator.userAgent)&&!window.opera){ -return true; -} -return false; -},findPosX:function(obj){ -var _19=0; -if(obj.offsetParent){ -while(obj.offsetParent){ -_19+=obj.offsetLeft; -obj=obj.offsetParent; -} -}else{ -if(obj.x){ -_19+=obj.x; -} -} -return _19; -},findPosY:function(obj){ -var _20=0; -if(obj.offsetParent){ -while(obj.offsetParent){ -_20+=obj.offsetTop; -obj=obj.offsetParent; -} -}else{ -if(obj.y){ -_20+=obj.y; -} -} -return _20; -},isFuncLike:function(obj){ -return (typeof (obj)=="function"); -}}); -PlotKit.Base.map=function(fn,lst){ -if(PlotKit.Base.usingPrototype()){ -var _23=[]; -for(var x in lst){ -if(typeof (lst[x])=="function"){ -continue; -} -_23.push(fn(lst[x])); -} -return _23; -}else{ -return MochiKit.Base.map(fn,lst); -} -}; -PlotKit.Base.items=function(lst){ -if(PlotKit.Base.usingPrototype()){ -var _25=[]; -for(var x in lst){ -if(typeof (lst[x])=="function"){ -continue; -} -_25.push([x,lst[x]]); -} -return _25; -}else{ -return MochiKit.Base.items(lst); -} -}; -PlotKit.Base.keys=function(lst){ -if(PlotKit.Base.usingPrototype()){ -var _26=[]; -for(var x in lst){ -if(typeof (lst[x])=="function"){ -continue; -} -_26.push(x); -} -return _26; -}else{ -return MochiKit.Base.keys(lst); -} -}; -PlotKit.Base.baseColors=function(){ -var _27=MochiKit.Color.Color.fromHexString; -return [_27("#476fb2"),_27("#be2c2b"),_27("#85b730"),_27("#734a99"),_27("#26a1c5"),_27("#fb8707"),_27("#000000")]; -}; -PlotKit.Base.EXPORT=["baseColors","collapse","findPosX","findPosY","uniq","isFuncLike","excanvasSupported"]; -PlotKit.Base.EXPORT_OK=[]; -PlotKit.Base.__new__=function(){ +MochiKit.Signal.EXPORT=["connect","disconnect","signal","disconnectAll","disconnectAllTo"]; +MochiKit.Signal.__new__=function(win){ var m=MochiKit.Base; -m.nameFunctions(this); -this.EXPORT_TAGS={":common":this.EXPORT,":all":m.concat(this.EXPORT,this.EXPORT_OK)}; -}; -PlotKit.Base.__new__(); -MochiKit.Base._exportSymbols(this,PlotKit.Base); +this._document=document; +this._window=win; +this._lock=false; +this._dirty=false; try{ -if(typeof (PlotKit.Base)=="undefined"){ -throw ""; -} +this.connect(window,"onunload",this._unloadCache); } 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__(); +this.EXPORT_TAGS={":common":this.EXPORT,":all":m.concat(this.EXPORT,this.EXPORT_OK)}; +m.nameFunctions(this); }; -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; +MochiKit.Signal.__new__(this); +if(MochiKit.__export__){ +connect=MochiKit.Signal.connect; +disconnect=MochiKit.Signal.disconnect; +disconnectAll=MochiKit.Signal.disconnectAll; +signal=MochiKit.Signal.signal; } -this.bars=new Array(); -this.points=new Array(); -this.slices=new Array(); -this.xticks=new Array(); -this.yticks=new Array(); +MochiKit.Base._exportSymbols(this,MochiKit.Signal); + + +Date.ext={};Date.ext.util={};Date.ext.util.xPad=function(x,pad,r){if(typeof (r)=="undefined"){r=10}for(;parseInt(x,10)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||x1this.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; -} -_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; +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; } -if(_50.y>=1){ -_50.y=1; +if(_14.y>=1){ +_14.y=1; } -if((_50.x>=0)&&(_50.x<=1)){ -this.points.push(_50); +if((_14.x>=0)&&(_14.x<=1)){ +this.points.push(_14); } } -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=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=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]; +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=_26; this.container=this.element.parentNode; -this.isIE=PlotKit.Base.excanvasSupported(); -if(this.isIE&&!_66(G_vmlCanvasManager)){ +this.isIE=(/MSIE/.test(navigator.userAgent)&&!window.opera); +if(this.isIE&&!isNil(G_vmlCanvasManager)){ this.IEDelay=0.5; this.maxTries=5; this.renderDelay=null; @@ -4284,370 +3329,75 @@ 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() - needs to be enclosed in
"; +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.render=function(){ -if(this.isIE){ -try{ -if(this.renderDelay){ -this.renderDelay.cancel(); -this.renderDelay=null; -} -var _68=this.element.getContext("2d"); -} -catch(e){ -this.isFirstRender=false; -if(this.maxTries-->0){ -this.renderDelay=MochiKit.Async.wait(this.IEDelay); -this.renderDelay.addCallback(bind(this.render,this)); -} -return; -} -} -if(this.options.drawBackground){ -this._renderBackground(); -} -if(this.layout.style=="line"){ -this._renderLineChart(); -this._renderLineAxis(); -} -}; -PlotKit.CanvasRenderer.prototype._renderLineChart=function(){ -var _69=this.element.getContext("2d"); -var _70=this.options.colorScheme.length; -var _71=this.options.colorScheme; -var _72=MochiKit.Base.keys(this.layout.datasets); -var _73=_72.length; -var _74=MochiKit.Base.bind; -var _75=MochiKit.Base.partial; -for(var i=0;i<_73;i++){ -var _76=_72[i]; -var _77=_71[i%_70]; -var _78=this.options.strokeColorTransform; -_69.save(); -_69.fillStyle=_77.toRGBString(); -if(this.options.strokeColor){ -_69.strokeStyle=this.options.strokeColor.toRGBString(); -}else{ -if(this.options.strokeColorTransform){ -_69.strokeStyle=_77[_78]().toRGBString(); -} -} -_69.lineWidth=this.options.strokeWidth; -var _79=function(ctx){ -ctx.beginPath(); -ctx.moveTo(this.area.x,this.area.y+this.area.h); -var _81=function(_82,_83){ -if(_83.name==_76){ -_82.lineTo(this.area.w*_83.x+this.area.x,this.area.h*_83.y+this.area.y); -} -}; -MochiKit.Iter.forEach(this.layout.points,_75(_81,ctx),this); -ctx.lineTo(this.area.w+this.area.x,this.area.h+this.area.y); -ctx.lineTo(this.area.x,this.area.y+this.area.h); -ctx.closePath(); -}; -if(this.options.shouldFill){ -_74(_79,this)(_69); -_69.fill(); -} -if(this.options.shouldStroke){ -_74(_79,this)(_69); -_69.stroke(); -} -_69.restore(); -} -}; -PlotKit.CanvasRenderer.prototype._renderLineAxis=function(){ -this._renderAxis(); -}; -PlotKit.CanvasRenderer.prototype._renderAxis=function(){ -if(!this.options.drawXAxis&&!this.options.drawYAxis){ -return; -} -var _84=this.element.getContext("2d"); -var _85={"style":{"position":"absolute","fontSize":this.options.axisLabelFontSize+"px","zIndex":10,"color":this.options.axisLabelColor.toRGBString(),"width":this.options.axisLabelWidth+"px","overflow":"hidden"}}; -_84.save(); -_84.strokeStyle=this.options.axisLineColor.toRGBString(); -_84.lineWidth=this.options.axisLineWidth; -if(this.options.drawYAxis){ -if(this.layout.yticks){ -var _86=function(_87){ -if(typeof (_87)=="function"){ -return; -} -var x=this.area.x; -var y=this.area.y+_87[0]*this.area.h; -_84.beginPath(); -_84.moveTo(x,y); -_84.lineTo(x-this.options.axisTickSize,y); -_84.closePath(); -_84.stroke(); -var _89=DIV(_85,_87[1]); -var top=(y-this.options.axisLabelFontSize/2); -if(top<0){ -top=0; -} -if(top+this.options.axisLabelFontSize+3>this.height){ -_89.style.bottom="0px"; -}else{ -_89.style.top=top+"px"; -} -_89.style.left="0px"; -_89.style.textAlign="right"; -_89.style.width=this.options.yAxisLabelWidth+"px"; -MochiKit.DOM.appendChildNodes(this.container,_89); -this.ylabels.push(_89); -}; -MochiKit.Iter.forEach(this.layout.yticks,bind(_86,this)); -var _91=this.ylabels[0]; -var _92=this.options.axisLabelFontSize; -var _93=parseInt(_91.style.top)+_92; -if(_93>this.height-_92){ -_91.style.top=(parseInt(_91.style.top)-_92/2)+"px"; -} -} -_84.beginPath(); -_84.moveTo(this.area.x,this.area.y); -_84.lineTo(this.area.x,this.area.y+this.area.h); -_84.closePath(); -_84.stroke(); -} -if(this.options.drawXAxis){ -if(this.layout.xticks){ -var _86=function(_94){ -if(typeof (dataset)=="function"){ -return; -} -var x=this.area.x+_94[0]*this.area.w; -var y=this.area.y+this.area.h; -_84.beginPath(); -_84.moveTo(x,y); -_84.lineTo(x,y+this.options.axisTickSize); -_84.closePath(); -_84.stroke(); -var _95=DIV(_85,_94[1]); -_95.style.textAlign="center"; -_95.style.bottom="0px"; -var _96=(x-this.options.axisLabelWidth/2); -if(_96+this.options.axisLabelWidth>this.width){ -_96=this.width-this.options.xAxisLabelWidth; -_95.style.textAlign="right"; -} -if(_96<0){ -_96=0; -_95.style.textAlign="left"; -} -_95.style.left=_96+"px"; -_95.style.width=this.options.xAxisLabelWidth+"px"; -MochiKit.DOM.appendChildNodes(this.container,_95); -this.xlabels.push(_95); -}; -MochiKit.Iter.forEach(this.layout.xticks,bind(_86,this)); -} -_84.beginPath(); -_84.moveTo(this.area.x,this.area.y+this.area.h); -_84.lineTo(this.area.x+this.area.w,this.area.y+this.area.h); -_84.closePath(); -_84.stroke(); -} -_84.restore(); +this.container.style.position="relative"; +this.container.style.width=this.width+"px"; }; -PlotKit.CanvasRenderer.prototype._renderBackground=function(){ -var _97=this.element.getContext("2d"); -_97.save(); -_97.fillStyle=this.options.backgroundColor.toRGBString(); -_97.fillRect(0,0,this.width,this.height); -_97.restore(); -}; -PlotKit.CanvasRenderer.prototype.clear=function(){ +DygraphCanvasRenderer.prototype.clear=function(){ if(this.isIE){ try{ if(this.clearDelay){ this.clearDelay.cancel(); this.clearDelay=null; } -var _98=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 _98=this.element.getContext("2d"); -_98.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.prototype._initialiseEvents=function(){ -var _99=MochiKit.Signal.connect; -var bind=MochiKit.Base.bind; -_99(this.element,"onclick",bind(this.onclick,this)); -}; -PlotKit.CanvasRenderer.prototype._resolveObject=function(e){ -var x=(e.mouse().page.x-PlotKit.Base.findPosX(this.element)-this.area.x)/this.area.w; -var y=(e.mouse().page.y-PlotKit.Base.findPosY(this.element)-this.area.y)/this.area.h; -var _102=this.layout.hitTest(x,y); -if(_102){ -return _102; -} -return null; -}; -PlotKit.CanvasRenderer.prototype._createEventObject=function(_103,e){ -if(_103==null){ -return null; -} -e.chart=_103; -return e; -}; -PlotKit.CanvasRenderer.prototype.onclick=function(e){ -var _104=this._resolveObject(e); -var _105=this._createEventObject(_104,e); -if(_105!=null){ -MochiKit.Signal.signal(this,"onclick",_105); -} -}; -PlotKit.CanvasRenderer.prototype.onmouseover=function(e){ -var _106=this._resolveObject(e); -var _107=this._createEventObject(_106,e); -if(_107!=null){ -signal(this,"onmouseover",_107); -} -}; -PlotKit.CanvasRenderer.prototype.onmouseout=function(e){ -var _108=this._resolveObject(e); -var _109=this._createEventObject(_108,e); -if(_109==null){ -signal(this,"onmouseout",e); -}else{ -signal(this,"onmouseout",_109); -} -}; -PlotKit.CanvasRenderer.prototype.onmousemove=function(e){ -var _110=this._resolveObject(e); -var _111=this._createEventObject(_110,e); -if((_110==null)&&(this.event_isinside==null)){ -return; -} -if((_110!=null)&&(this.event_isinside==null)){ -signal(this,"onmouseover",_111); -} -if((_110==null)&&(this.event_isinside!=null)){ -signal(this,"onmouseout",_111); +var _29=this.element.getContext("2d"); +_29.clearRect(0,0,this.width,this.height); +for(var i=0;i1;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 _37=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<_37.length;i++){ var x=this.area.x; -var y=this.area.y+_14[i][0]*this.area.h; +var y=this.area.y+_37[i][0]*this.area.h; ctx.beginPath(); ctx.moveTo(x,y); ctx.lineTo(x+this.area.w,y); @@ -4656,12 +3406,12 @@ ctx.stroke(); } } if(this.options.drawXGrid){ -var _14=this.layout.xticks; +var _37=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<_37.length;i++){ +var x=this.area.x+_37[i][0]*this.area.w; var y=this.area.y+this.area.h; ctx.beginPath(); ctx.moveTo(x,y); @@ -4671,105 +3421,213 @@ ctx.stroke(); } } this._renderLineChart(); -this._renderLineAxis(); -}; -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; +this._renderAxis(); }; -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 _40=this.element.getContext("2d"); +var _41={"style":{"position":"absolute","fontSize":this.options.axisLabelFontSize+"px","zIndex":10,"color":this.options.axisLabelColor.toRGBString(),"width":this.options.axisLabelWidth+"px","overflow":"hidden"}}; +_40.save(); +_40.strokeStyle=this.options.axisLineColor.toRGBString(); +_40.lineWidth=this.options.axisLineWidth; +if(this.options.drawYAxis){ +if(this.layout.yticks){ +for(var i=0;ithis.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"; +this.container.appendChild(_43); +this.ylabels.push(_43); +} +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"; } } +_40.beginPath(); +_40.moveTo(this.area.x,this.area.y); +_40.lineTo(this.area.x,this.area.y+this.area.h); +_40.closePath(); +_40.stroke(); } +if(this.options.drawXAxis){ +if(this.layout.xticks){ +for(var i=0;ithis.width){ +_48=this.width-this.options.xAxisLabelWidth; +_43.style.textAlign="right"; +} +if(_48<0){ +_48=0; +_43.style.textAlign="left"; +} +_43.style.left=_48+"px"; +_43.style.width=this.options.xAxisLabelWidth+"px"; +this.container.appendChild(_43); +this.xlabels.push(_43); +} +} +_40.beginPath(); +_40.moveTo(this.area.x,this.area.y+this.area.h); +_40.lineTo(this.area.x+this.area.w,this.area.y+this.area.h); +_40.closePath(); +_40.stroke(); +} +_40.restore(); +}; +DygraphCanvasRenderer.prototype._renderLineChart=function(){ +var _49=this.element.getContext("2d"); +var _50=this.options.colorScheme.length; +var _51=this.options.colorScheme; +var _52=MochiKit.Base.keys(this.layout.datasets); +var _53=this.layout.options.errorBars; +var _54=_52.length; +var _55=MochiKit.Base.bind; +var _56=MochiKit.Base.partial; +for(var i=0;i=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(); } -_40[0]=_46[0]; -_40[1]=_46[1]; -_39=_45.canvasx; } }; -var _47=_37.colorWithAlpha(0.15); -ctx.fillStyle=_47.toRGBString(); +var _68=function(ctx){ +for(var i=0;i<_54;i++){ +var _69=_52[i]; +var _70=_51[i%_50]; +var _71=this.options.strokeColorTransform; +_49.save(); +_49.strokeStyle=_70.toRGBString(); +_49.lineWidth=this.options.strokeWidth; +var _72=-1; +var _73=[-1,-1]; +var _74=0; +var _75=this.layout.yscale; +var _76=_70.colorWithAlpha(0.15); +ctx.fillStyle=_76.toRGBString(); ctx.beginPath(); -MochiKit.Iter.forEach(this.layout.points,_24(_43,ctx),this); +for(var j=0;j=0){ +ctx.moveTo(_72,_73[0]); +ctx.lineTo(_77.canvasx,_78[0]); +ctx.lineTo(_77.canvasx,_78[1]); +ctx.lineTo(_72,_73[1]); +ctx.closePath(); +} +_73[0]=_78[0]; +_73[1]=_78[1]; +_72=_77.canvasx; +} +} ctx.fill(); } }; -if(_21){ -_23(_35,this)(_17); +if(_53){ +_55(_68,this)(_49); } -_23(_27,this)(_17); -_17.restore(); +_55(_59,this)(_49); +_49.restore(); }; -Dygraph=function(div,_49,_50){ +Dygraph=function(div,_80,_81){ 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,_80,arguments[2],arguments[3]); }else{ -this.__init__(div,_49,_50); +this.__init__(div,_80,_81); } } }; @@ -4790,29 +3648,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,_82,_83,_84){ +if(_83!=null){ +var _85=["Date"]; +for(var i=0;i<_83.length;i++){ +_85.push(_83[i]); } -MochiKit.Base.update(_53,{"labels":_54}); +MochiKit.Base.update(_84,{"labels":_85}); } -this.__init__(div,_51,_53); +this.__init__(div,_82,_84); }; -Dygraph.prototype.__init__=function(div,_55,_56){ -if(_56==null){ -_56={}; +Dygraph.prototype.__init__=function(div,_86,_87){ +if(_87==null){ +_87={}; } this.maindiv_=div; -this.file_=_55; -this.rollPeriod_=_56.rollPeriod||Dygraph.DEFAULT_ROLL_PERIOD; +this.file_=_86; +this.rollPeriod_=_87.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_=_87.fractions||false; +this.dateWindow_=_87.dateWindow||null; +this.valueRange_=_87.valueRange||null; +this.wilsonInterval_=_87.wilsonInterval||true; div.innerHTML=""; if(div.style.width==""){ div.style.width=Dygraph.DEFAULT_WIDTH+"px"; @@ -4823,72 +3680,76 @@ 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_,_87); 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(_88){ +if(typeof (this.user_attrs_[_88])!="undefined"){ +return this.user_attrs_[_88]; }else{ -if(typeof (this.attrs_[_57])!="undefined"){ -return this.attrs_[_57]; +if(typeof (this.attrs_[_88])!="undefined"){ +return this.attrs_[_88]; }else{ return null; } } }; -Dygraph.prototype.log=function(_58,_59){ +Dygraph.prototype.log=function(_89,_90){ if(typeof (console)!="undefined"){ -switch(_58){ +switch(_89){ case Dygraph.DEBUG: -console.debug("dygraphs: "+_59); +console.debug("dygraphs: "+_90); break; case Dygraph.INFO: -console.info("dygraphs: "+_59); +console.info("dygraphs: "+_90); break; case Dygraph.WARNING: -console.warn("dygraphs: "+_59); +console.warn("dygraphs: "+_90); break; case Dygraph.ERROR: -console.error("dygraphs: "+_59); +console.error("dygraphs: "+_90); break; } } }; -Dygraph.prototype.info=function(_60){ -this.log(Dygraph.INFO,_60); +Dygraph.prototype.info=function(_91){ +this.log(Dygraph.INFO,_91); }; -Dygraph.prototype.warn=function(_61){ -this.log(Dygraph.WARNING,_61); +Dygraph.prototype.warn=function(_92){ +this.log(Dygraph.WARNING,_92); }; -Dygraph.prototype.error=function(_62){ -this.log(Dygraph.ERROR,_62); +Dygraph.prototype.error=function(_93){ +this.log(Dygraph.ERROR,_93); }; Dygraph.prototype.rollPeriod=function(){ return this.rollPeriod_; }; Dygraph.prototype.createInterface_=function(){ -var _63=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(this.graphDiv,this.canvas_); +var _94=this.maindiv_; +this.graphDiv=document.createElement("div"); +this.graphDiv.style.width=this.width_+"px"; +this.graphDiv.style.height=this.height_+"px"; +_94.appendChild(this.graphDiv); +this.canvas_=document.createElement("canvas"); +this.canvas_.style.position="absolute"; +this.canvas_.width=this.width_; +this.canvas_.height=this.height_; +this.graphDiv.appendChild(this.canvas_); this.hidden_=this.createPlotKitCanvas_(this.canvas_); connect(this.hidden_,"onmousemove",this,function(e){ this.mouseMove_(e); @@ -4897,21 +3758,21 @@ connect(this.hidden_,"onmouseout",this,function(e){ this.mouseOut_(e); }); }; -Dygraph.prototype.createPlotKitCanvas_=function(_66){ +Dygraph.prototype.createPlotKitCanvas_=function(_96){ var h=document.createElement("canvas"); h.style.position="absolute"; -h.style.top=_66.style.top; -h.style.left=_66.style.left; +h.style.top=_96.style.top; +h.style.left=_96.style.left; h.width=this.width_; h.height=this.height_; -MochiKit.DOM.appendChildNodes(this.graphDiv,h); +this.graphDiv.appendChild(h); return h; }; Dygraph.prototype.setColors_=function(){ var num=this.attr_("labels").length-1; this.colors_=[]; -var _69=this.attr_("colors"); -if(!_69){ +var _99=this.attr_("colors"); +if(!_99){ var sat=this.attr_("colorSaturation")||1; var val=this.attr_("colorValue")||0.5; for(var i=1;i<=num;i++){ @@ -4920,8 +3781,8 @@ this.colors_.push(MochiKit.Color.Color.fromHSV(hue,sat,val)); } }else{ for(var i=0;i=10){ -_80.doZoom_(Math.min(_82,_84),Math.max(_82,_84)); +if(_130>=10){ +self.doZoom_(Math.min(_116,_118),Math.max(_116,_118)); }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; +_116=null; +_117=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(_132){ +self.dateWindow_=null; +self.drawGraph_(self.rawData_); +var _133=self.rawData_[0][0]; +var _134=self.rawData_[self.rawData_.length-1][0]; +if(self.attr_("zoomCallback")){ +self.attr_("zoomCallback")(_133,_134); } }); }; -Dygraph.prototype.drawZoomRect_=function(_101,endX,_103){ +Dygraph.prototype.drawZoomRect_=function(_135,endX,_137){ var ctx=this.canvas_.getContext("2d"); -if(_103){ -ctx.clearRect(Math.min(_101,_103),0,Math.abs(_101-_103),this.height_); +if(_137){ +ctx.clearRect(Math.min(_135,_137),0,Math.abs(_135-_137),this.height_); } -if(endX&&_101){ +if(endX&&_135){ 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(_135,endX),0,Math.abs(endX-_135),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_107)){ -_107=x; +Dygraph.prototype.doZoom_=function(lowX,_139){ +var _140=this.layout_.points; +var _141=null; +var _142=null; +for(var i=0;i<_140.length;i++){ +var cx=_140[i].canvasx; +var x=_140[i].xval; +if(cx_141)){ +_141=x; } -if(cx>_105&&(_108==null||x<_108)){ -_108=x; +if(cx>_139&&(_142==null||x<_142)){ +_142=x; } } -if(_107==null){ -_107=_106[0].xval; +if(_141==null){ +_141=_140[0].xval; } -if(_108==null){ -_108=_106[_106.length-1].xval; +if(_142==null){ +_142=_140[_140.length-1].xval; } -this.dateWindow_=[_107,_108]; +this.dateWindow_=[_141,_142]; this.drawGraph_(this.rawData_); if(this.attr_("zoomCallback")){ -this.attr_("zoomCallback")(_107,_108); +this.attr_("zoomCallback")(_141,_142); } }; -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(_144){ +var _145=_144.mouse().page.x-Dygraph.findPosX(this.hidden_); +var _146=this.layout_.points; +var _147=-1; +var _148=-1; +var _149=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<_146.length;i++){ +var dist=Math.abs(_146[i].canvasx-_145); +if(dist>_149){ break; } -_115=dist; +_149=dist; idx=i; } if(idx>=0){ -_113=_112[idx].xval; +_147=_146[idx].xval; } -if(_111>_112[_112.length-1].canvasx){ -_113=_112[_112.length-1].xval; +if(_145>_146[_146.length-1].canvasx){ +_147=_146[_146.length-1].xval; } -var _118=[]; -for(var i=0;i<_112.length;i++){ -if(_112[i].xval==_113){ -_118.push(_112[i]); +var _152=[]; +for(var i=0;i<_146.length;i++){ +if(_146[i].xval==_147){ +_152.push(_146[i]); } } -var _119=this.attr_("highlightCircleSize"); +var _153=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-_153-1,0,2*_153+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(_152.length>0){ +var _145=_152[0].canvasx; +var _155=this.attr_("xValueFormatter")(_147,this)+":"; var clen=this.colors_.length; -for(var i=0;i<_118.length;i++){ -if(!isOK(_118[i].canvasy)){ +for(var i=0;i<_152.length;i++){ +if(!isOK(_152[i].canvasy)){ continue; } if(this.attr_("labelsSeparateLines")){ -_121+="
"; +_155+="
"; } -var _123=_118[i]; -_121+=" "+_123.name+":"+this.round_(_123.yval,2); +var _157=_152[i]; +_155+=" "+_157.name+":"+this.round_(_157.yval,2); } -this.attr_("labelsDiv").innerHTML=_121; -this.lastx_=_113; +this.attr_("labelsDiv").innerHTML=_155; +this.lastx_=_147; ctx.save(); -for(var i=0;i<_118.length;i++){ -if(!isOK(_118[i%clen].canvasy)){ +for(var i=0;i<_152.length;i++){ +if(!isOK(_152[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(_145,_152[i%clen].canvasy,_153,0,360,false); ctx.fill(); } ctx.restore(); -this.previousVerticalX_=_111; +this.previousVerticalX_=_145; } }; -Dygraph.prototype.mouseOut_=function(_124){ +Dygraph.prototype.mouseOut_=function(_158){ var ctx=this.canvas_.getContext("2d"); ctx.clearRect(0,0,this.width_,this.height_); this.attr_("labelsDiv").innerHTML=""; @@ -5138,34 +4036,34 @@ return ""+x; } }; Dygraph.prototype.hmsString_=function(date){ -var _126=Dygraph.zeropad; +var _160=Dygraph.zeropad; var d=new Date(date); if(d.getSeconds()){ -return _126(d.getHours())+":"+_126(d.getMinutes())+":"+_126(d.getSeconds()); +return _160(d.getHours())+":"+_160(d.getMinutes())+":"+_160(d.getSeconds()); }else{ if(d.getMinutes()){ -return _126(d.getHours())+":"+_126(d.getMinutes()); +return _160(d.getHours())+":"+_160(d.getMinutes()); }else{ -return _126(d.getHours()); +return _160(d.getHours()); } } }; Dygraph.dateString_=function(date,self){ -var _129=Dygraph.zeropad; +var _162=Dygraph.zeropad; var d=new Date(date); var year=""+d.getFullYear(); -var _131=_129(d.getMonth()+1); -var day=_129(d.getDate()); +var _164=_162(d.getMonth()+1); +var day=_162(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+"/"+_164+"/"+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,_168){ +var _169=Math.pow(10,_168); +return Math.round(num*_169)/_169; }; Dygraph.prototype.loadedEvent_=function(data){ this.rawData_=this.parseCSV_(data); @@ -5174,16 +4072,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 _171,endDate; if(this.dateWindow_){ -_138=this.dateWindow_[0]; +_171=this.dateWindow_[0]; endDate=this.dateWindow_[1]; }else{ -_138=this.rawData_[0][0]; +_171=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 _172=this.attr_("xTicker")(_171,endDate,this); +this.layout_.updateOptions({xTicks:_172}); }; Dygraph.SECONDLY=0; Dygraph.TEN_SECONDLY=1; @@ -5212,161 +4110,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.DAILY){ -_151.push({v:t,label:new Date(t+3600*1000).strftime(_153)}); +if(frac==0||_183>=Dygraph.DAILY){ +_184.push({v:t,label:new Date(t+3600*1000).strftime(_186)}); }else{ -_151.push({v:t,label:this.hmsString_(t)}); +_184.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 _188; +var _189=1; +if(_183==Dygraph.MONTHLY){ +_188=[0,1,2,3,4,5,6,7,8,9,10,11,12]; }else{ -if(_150==Dygraph.QUARTERLY){ -_155=[0,3,6,9]; +if(_183==Dygraph.QUARTERLY){ +_188=[0,3,6,9]; }else{ -if(_150==Dygraph.BIANNUAL){ -_155=[0,6]; +if(_183==Dygraph.BIANNUAL){ +_188=[0,6]; }else{ -if(_150==Dygraph.ANNUAL){ -_155=[0]; +if(_183==Dygraph.ANNUAL){ +_188=[0]; }else{ -if(_150==Dygraph.DECADAL){ -_155=[0]; -_156=10; +if(_183==Dygraph.DECADAL){ +_188=[0]; +_189=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 _190=new Date(_181).getFullYear(); +var _191=new Date(_182).getFullYear(); +var _192=Dygraph.zeropad; +for(var i=_190;i<=_191;i++){ +if(i%_189!=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<_188.length;j++){ +var _193=i+"/"+_192(1+_188[j])+"/01"; +var t=Date.parse(_193); +if(t<_181||t>_182){ continue; } -_151.push({v:t,label:new Date(t).strftime("%b %y")}); +_184.push({v:t,label:new Date(t).strftime("%b %y")}); } } } -return _151; +return _184; }; -Dygraph.dateTicker=function(_161,_162,self){ -var _163=-1; +Dygraph.dateTicker=function(_194,_195,self){ +var _196=-1; for(var i=0;i=self.attr_("pixelsPerXLabel")){ -_163=i; +var _197=self.NumXTicks(_194,_195,i); +if(self.width_/_197>=self.attr_("pixelsPerXLabel")){ +_196=i; break; } } -if(_163>=0){ -return self.GetXAxis(_161,_162,_163); +if(_196>=0){ +return self.GetXAxis(_194,_195,_196); }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 _200=[1,2,5]; +var _201,low_val,high_val,nTicks; +var _202=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 _203=Math.pow(10,i); +for(var j=0;j<_200.length;j++){ +_201=_203*_200[j]; +low_val=Math.floor(minV/_201)*_201; +high_val=Math.ceil(maxV/_201)*_201; +nTicks=(high_val-low_val)/_201; +var _204=self.height_/nTicks; +if(_204>_202){ break; } } -if(_171>_169){ +if(_204>_202){ break; } } -var _172=[]; +var _205=[]; for(var i=0;i=k*k*k){ -_174=self.round_(_173/(k*k*k),1)+"B"; +if(_206>=k*k*k){ +_207=self.round_(_206/(k*k*k),1)+"B"; }else{ -if(_173>=k*k){ -_174=self.round_(_173/(k*k),1)+"M"; +if(_206>=k*k){ +_207=self.round_(_206/(k*k),1)+"M"; }else{ -if(_173>=k){ -_174=self.round_(_173/k,1)+"K"; +if(_206>=k){ +_207=self.round_(_206/k,1)+"K"; } } } } -_172.push({label:_174,v:_173}); +_205.push({label:_207,v:_206}); } -return _172; +return _205; }; Dygraph.prototype.addYTicks_=function(minY,maxY){ -var _178=Dygraph.numericTicks(minY,maxY,this); -this.layout_.updateOptions({yAxis:[minY,maxY],yTicks:_178}); +var _211=Dygraph.numericTicks(minY,maxY,this); +this.layout_.updateOptions({yAxis:[minY,maxY],yTicks:_211}); }; -Dygraph.prototype.extremeValues_=function(_179){ +Dygraph.prototype.extremeValues_=function(_212){ 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<_212.length;j++){ +var y=_212[j][1][0]; if(!y){ continue; } -var low=y-_179[j][1][1]; -var high=y+_179[j][1][2]; +var low=y-_212[j][1][1]; +var high=y+_212[j][1][2]; if(low>y){ low=y; } @@ -5381,8 +4279,8 @@ minY=low; } } }else{ -for(var j=0;j<_179.length;j++){ -var y=_179[j][1]; +for(var j=0;j<_212.length;j++){ +var y=_212[j][1]; if(!y){ continue; } @@ -5400,65 +4298,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=low&&_183[k][0]<=high){ -_184.push(_183[k]); +var _217=[]; +for(var k=0;k<_216.length;k++){ +if(_216[k][0]>=low&&_216[k][0]<=high){ +_217.push(_216[k]); } } -_183=_184; +_216=_217; } -var _185=this.extremeValues_(_183); -var _186=_185[0]; -var _187=_185[1]; -if(!minY||_186maxY){ -maxY=_187; +if(!maxY||_220>maxY){ +maxY=_220; } 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<_216.length;j++){ +vals[j]=[_216[j][0],_216[j][1][0],_216[j][1][1],_216[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],_216); } } 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 _223=maxY+0.1*span; +var _224=minY-0.1*span; +if(_224<0&&minY>=0){ +_224=0; } -if(_190>0&&maxY<=0){ -_190=0; +if(_223>0&&maxY<=0){ +_223=0; } if(this.attr_("includeZero")){ if(maxY<0){ -_190=0; +_223=0; } if(minY>0){ -_191=0; +_224=0; } } -this.addYTicks_(_191,_190); +this.addYTicks_(_224,_223); } this.addXTicks_(); this.layout_.evaluateWithError(); @@ -5466,150 +4365,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(_225,_226){ +if(_225.length<2){ +return _225; } -var _193=Math.min(_193,_192.length-1); -var _194=[]; -var _195=this.attr_("sigma"); +var _226=Math.min(_226,_225.length-1); +var _227=[]; +var _228=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<_225.length;i++){ +num+=_225[i][1][0]; +den+=_225[i][1][1]; +if(i-_226>=0){ +num-=_225[i-_226][1][0]; +den-=_225[i-_226][1][1]; +} +var date=_225[i][0]; +var _231=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=_231<0?0:_231,n=den; +var pm=_228*Math.sqrt(p*(1-p)/n+_228*_228/(4*n*n)); +var _234=1+_228*_228/den; +var low=(p+_228*_228/(2*den)-pm)/_234; +var high=(p+_228*_228/(2*den)+pm)/_234; +_227[i]=[date,[p*mult,(p-low)*mult,(high-p)*mult]]; }else{ -_194[i]=[date,[0,0,0]]; +_227[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 _235=den?_228*Math.sqrt(_231*(1-_231)/den):1; +_227[i]=[date,[mult*_231,mult*_235,mult*_235]]; } }else{ -_194[i]=[date,mult*_198]; +_227[i]=[date,mult*_231]; } } }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 _237=0; +for(var i=0;i<_225.length;i++){ +var data=_225[i][1]; var y=data[1]; -_194[i]=[_192[i][0],[y,y-data[0],data[2]-y]]; +_227[i]=[_225[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]; +_237+=1; +if(i-_226>=0){ +var prev=_225[i-_226]; low-=prev[1][0]; mid-=prev[1][1]; high-=prev[1][2]; -_204-=1; +_237-=1; } -_194[i]=[_192[i][0],[1*mid/_204,1*(mid-low)/_204,1*(high-mid)/_204]]; +_227[i]=[_225[i][0],[1*mid/_237,1*(mid-low)/_237,1*(high-mid)/_237]]; } }else{ -var _206=Math.min(_193-1,_192.length-2); +var _239=Math.min(_226-1,_225.length-2); if(!this.attr_("errorBars")){ -if(_193==1){ -return _192; +if(_226==1){ +return _225; } -for(var i=0;i<_192.length;i++){ +for(var i=0;i<_225.length;i++){ var sum=0; -var _208=0; -for(var j=Math.max(0,i-_193+1);j=0||str.indexOf("/")>=0||isNaN(parseFloat(str))){ -_213=true; +_246=true; }else{ if(str.length==8&&str>"19700101"&&str<"20371231"){ -_213=true; +_246=true; } } -if(_213){ +if(_246){ this.attrs_.xValueFormatter=Dygraph.dateString_; this.attrs_.xValueParser=Dygraph.dateParser; this.attrs_.xTicker=Dygraph.dateTicker; @@ -5625,57 +4524,57 @@ this.attrs_.xTicker=Dygraph.numericTicks; }; Dygraph.prototype.parseCSV_=function(data){ var ret=[]; -var _214=data.split("\n"); -var _215=0; +var _247=data.split("\n"); +var _248=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]; +_248=1; +this.attrs_.labels=_247[0].split(","); +} +var _249; +var _250=false; +var _251=this.attr_("labels").length; +for(var i=_248;i<_247.length;i++){ +var line=_247[i]; if(line.length==0){ continue; } -var _220=line.split(","); -if(_220.length<2){ +var _253=line.split(","); +if(_253.length<2){ continue; } -var _221=[]; -if(!_217){ -this.detectTypeFromString_(_220[0]); -_216=this.attr_("xValueParser"); -_217=true; +var _254=[]; +if(!_250){ +this.detectTypeFromString_(_253[0]); +_249=this.attr_("xValueParser"); +_250=true; } -_221[0]=_216(_220[0],this); +_254[0]=_249(_253[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<_253.length;j++){ +var vals=_253[j].split("/"); +_254[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<_253.length;j+=2){ +_254[(j+1)/2]=[parseFloat(_253[j]),parseFloat(_253[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<_253.length;j++){ +var vals=_253[j].split(";"); +_254[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<_253.length;j++){ +_254[j]=parseFloat(_253[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(_254); +if(_254.length!=_251){ +this.error("Number of columns in line "+i+" ("+_254.length+") does not agree with number of labels ("+_251+") "+line); } } return ret; @@ -5699,19 +4598,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 _255=MochiKit.Base.clone(data); for(var i=0;i=0){ this.loadedEvent_(this.file_); }else{ var req=new XMLHttpRequest(); -var _229=this; +var _262=this; req.onreadystatechange=function(){ if(req.readyState==4){ if(req.status==200){ -_229.loadedEvent_(req.responseText); +_262.loadedEvent_(req.responseText); } } }; @@ -5800,39 +4699,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(_263){ +if(_263.rollPeriod){ +this.rollPeriod_=_263.rollPeriod; } -if(_230.dateWindow){ -this.dateWindow_=_230.dateWindow; +if(_263.dateWindow){ +this.dateWindow_=_263.dateWindow; } -if(_230.valueRange){ -this.valueRange_=_230.valueRange; +if(_263.valueRange){ +this.valueRange_=_263.valueRange; } -MochiKit.Base.update(this.user_attrs_,_230); +MochiKit.Base.update(this.user_attrs_,_263); 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(_263["file"]&&_263["file"]!=this.file_){ +this.file_=_263["file"]; this.start_(); }else{ this.drawGraph_(this.rawData_); } }; -Dygraph.prototype.adjustRoll=function(_231){ -this.rollPeriod_=_231; +Dygraph.prototype.adjustRoll=function(_264){ +this.rollPeriod_=_264; this.drawGraph_(this.rawData_); }; -Dygraph.GVizChart=function(_232){ -this.container=_232; +Dygraph.GVizChart=function(_265){ +this.container=_265; }; -Dygraph.GVizChart.prototype.draw=function(data,_233){ +Dygraph.GVizChart.prototype.draw=function(data,_266){ this.container.innerHTML=""; -this.date_graph=new Dygraph(this.container,data,_233); +this.date_graph=new Dygraph(this.container,data,_266); }; DateGraph=Dygraph;