From 2160ed4ac550da045386e52c363e721cd6c44c29 Mon Sep 17 00:00:00 2001 From: Dan Vanderkam Date: Mon, 30 Nov 2009 00:38:19 -0500 Subject: [PATCH] remove Iter.js, thus breaking dygraphs --- dygraph-canvas.js | 26 +- dygraph-combined.js | 3118 ++++++++++++++++++++------------------------------ generate-combined.sh | 2 +- tests/grid_dot.html | 9 + 4 files changed, 1279 insertions(+), 1876 deletions(-) diff --git a/dygraph-canvas.js b/dygraph-canvas.js index 5b07496..53db3df 100644 --- a/dygraph-canvas.js +++ b/dygraph-canvas.js @@ -239,8 +239,12 @@ DygraphCanvasRenderer.prototype.clear = function() { var context = this.element.getContext("2d"); context.clearRect(0, 0, this.width, this.height); - MochiKit.Iter.forEach(this.xlabels, MochiKit.DOM.removeElement); - MochiKit.Iter.forEach(this.ylabels, MochiKit.DOM.removeElement); + for (var i = 0; i < this.xlabels.length; i++) { + MochiKit.DOM.removeElement(this.xlabels[i]); + } + for (var i = 0; i < this.ylabels.length; i++) { + MochiKit.DOM.removeElement(this.ylabels[i]); + } this.xlabels = new Array(); this.ylabels = new Array(); }; @@ -334,7 +338,8 @@ DygraphCanvasRenderer.prototype._renderAxis = function() { if (this.options.drawYAxis) { if (this.layout.yticks) { - var drawTick = function(tick) { + for (var i = 0; i < this.layout.yticks.length; i++) { + var tick = this.layout.yticks[i]; if (typeof(tick) == "function") return; var x = this.area.x; var y = this.area.y + tick[0] * this.area.h; @@ -358,9 +363,7 @@ DygraphCanvasRenderer.prototype._renderAxis = function() { label.style.width = this.options.yAxisLabelWidth + "px"; MochiKit.DOM.appendChildNodes(this.container, label); this.ylabels.push(label); - }; - - MochiKit.Iter.forEach(this.layout.yticks, bind(drawTick, this)); + } // The lowest tick on the y-axis often overlaps with the leftmost // tick on the x-axis. Shift the bottom tick up a little bit to @@ -383,7 +386,8 @@ DygraphCanvasRenderer.prototype._renderAxis = function() { if (this.options.drawXAxis) { if (this.layout.xticks) { - var drawTick = function(tick) { + for (var i = 0; i < this.layout.xticks.length; i++) { + var tick = this.layout.xticks[i]; if (typeof(dataset) == "function") return; var x = this.area.x + tick[0] * this.area.w; @@ -412,9 +416,7 @@ DygraphCanvasRenderer.prototype._renderAxis = function() { label.style.width = this.options.xAxisLabelWidth + "px"; MochiKit.DOM.appendChildNodes(this.container, label); this.xlabels.push(label); - }; - - MochiKit.Iter.forEach(this.layout.xticks, bind(drawTick, this)); + } } context.beginPath(); @@ -442,11 +444,11 @@ DygraphCanvasRenderer.prototype._renderLineChart = function() { var partial = MochiKit.Base.partial; //Update Points - var updatePoint = function(point) { + for (var i = 0; i < this.layout.points.length; i++) { + var point = this.layout.points[i]; point.canvasx = this.area.w * point.x + this.area.x; point.canvasy = this.area.h * point.y + this.area.y; } - MochiKit.Iter.forEach(this.layout.points, updatePoint, this); // create paths var isOK = function(x) { return x && !isNaN(x); }; diff --git a/dygraph-combined.js b/dygraph-combined.js index f694954..dc86ce7 100644 --- a/dygraph-combined.js +++ b/dygraph-combined.js @@ -1002,618 +1002,6 @@ serializeJSON=MochiKit.Base.serializeJSON; } MochiKit.Base._exportSymbols(this,MochiKit.Base); if(typeof (dojo)!="undefined"){ -dojo.provide("MochiKit.Iter"); -dojo.require("MochiKit.Base"); -} -if(typeof (JSAN)!="undefined"){ -JSAN.use("MochiKit.Base",[]); -} -try{ -if(typeof (MochiKit.Base)=="undefined"){ -throw ""; -} -} -catch(e){ -throw "MochiKit.Iter depends on MochiKit.Base!"; -} -if(typeof (MochiKit.Iter)=="undefined"){ -MochiKit.Iter={}; -} -MochiKit.Iter.NAME="MochiKit.Iter"; -MochiKit.Iter.VERSION="1.4"; -MochiKit.Base.update(MochiKit.Iter,{__repr__:function(){ -return "["+this.NAME+" "+this.VERSION+"]"; -},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(); -} -} -try{ -return self.iteratorRegistry.match(_151); -} -catch(e){ -var m=MochiKit.Base; -if(e==m.NotFound){ -e=new TypeError(typeof (_151)+": "+m.repr(_151)+" is not iterable"); -} -throw e; -} -},count:function(n){ -if(!n){ -n=0; -} -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; -}; -}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; -} -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; -} -return {repr:function(){ -return "ifilter(...)"; -},toString:m.forwardCall("repr"),next:function(){ -while(true){ -var rval=seq.next(); -if(pred(rval)){ -return 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; -} -} -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()); -}}; -},chain:function(p,q){ -var self=MochiKit.Iter; -var m=MochiKit.Base; -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(); -} -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; -} -} -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; -}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(); -} -} -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;i0&&_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; -} -} -}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; -} -return true; -} -},sorted:function(_1be,cmp){ -var rval=MochiKit.Iter.list(_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]); -} -}else{ -var self=MochiKit.Iter; -_1c7=self.iter(_1c7); -try{ -while(true){ -lst.push(_1c7.next()); -} -} -catch(e){ -if(e!=self.StopIteration){ -throw e; -} -} -} -return lst; -},groupby:function(_1ca,_1cb){ -var m=MochiKit.Base; -var self=MochiKit.Iter; -if(arguments.length<2){ -_1cb=m.operator.identity; -} -_1ca=self.iter(_1ca); -var pk=undefined; -var k=undefined; -var v; -function fetch(){ -v=_1ca.next(); -k=_1cb(v); -} -function eat(){ -var ret=v; -v=undefined; -return ret; -} -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; -} -} -pk=k; -return [k,{next:function(){ -if(v==undefined){ -fetch(); -} -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; -} -_1d4=self.iter(_1d4); -var _1d8=[]; -var _1d9=true; -var _1da; -var _1db=m.compare; -while(true){ -try{ -var _1dc=_1d4.next(); -var key=_1d5(_1dc); -} -catch(e){ -if(e==self.StopIteration){ -break; -} -throw e; -} -if(_1d9||_1db(key,_1da)!==0){ -var _1de=[]; -_1d8.push([key,_1de]); -} -_1de.push(_1dc); -_1d9=false; -_1da=key; -} -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 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(){ -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); -}; -MochiKit.Iter.__new__(); -if(MochiKit.__export__){ -reduce=MochiKit.Iter.reduce; -} -MochiKit.Base._exportSymbols(this,MochiKit.Iter); -if(typeof (dojo)!="undefined"){ dojo.provide("MochiKit.DOM"); dojo.require("MochiKit.Base"); } @@ -1649,8 +1037,8 @@ return MochiKit.DOM._window; return MochiKit.DOM._document; },withWindow:function(win,func){ var self=MochiKit.DOM; -var _1e8=self._document; -var _1e9=self._window; +var _150=self._document; +var _151=self._window; var rval; try{ self._window=win; @@ -1658,16 +1046,16 @@ self._document=win.document; rval=func(); } catch(e){ -self._window=_1e9; -self._document=_1e8; +self._window=_151; +self._document=_150; throw e; } -self._window=_1e9; -self._document=_1e8; +self._window=_151; +self._document=_150; return rval; },formContents:function(elem){ -var _1ec=[]; -var _1ed=[]; +var _154=[]; +var _155=[]; var m=MochiKit.Base; var self=MochiKit.DOM; if(typeof (elem)=="undefined"||elem===null){ @@ -1678,11 +1066,11 @@ elem=self.getElement(elem); m.nodeWalk(elem,function(elem){ var name=elem.name; if(m.isNotEmpty(name)){ -var _1f2=elem.tagName.toUpperCase(); -if(_1f2==="INPUT"&&(elem.type=="radio"||elem.type=="checkbox")&&!elem.checked){ +var _15a=elem.tagName.toUpperCase(); +if(_15a==="INPUT"&&(elem.type=="radio"||elem.type=="checkbox")&&!elem.checked){ return null; } -if(_1f2==="SELECT"){ +if(_15a==="SELECT"){ if(elem.type=="select-one"){ if(elem.selectedIndex>=0){ var opt=elem.options[elem.selectedIndex]; @@ -1693,18 +1081,18 @@ if(h&&!h.match(/^[^>]+\svalue\s*=/i)){ v=opt.text; } } -_1ec.push(name); -_1ed.push(v); +_154.push(name); +_155.push(v); return null; } -_1ec.push(name); -_1ed.push(""); +_154.push(name); +_155.push(""); return null; }else{ var opts=elem.options; if(!opts.length){ -_1ec.push(name); -_1ed.push(""); +_154.push(name); +_155.push(""); return null; } for(var i=0;i]+\svalue\s*=/i)){ v=opt.text; } } -_1ec.push(name); -_1ed.push(v); +_154.push(name); +_155.push(v); } return null; } } -if(_1f2==="FORM"||_1f2==="P"||_1f2==="SPAN"||_1f2==="DIV"){ +if(_15a==="FORM"||_15a==="P"||_15a==="SPAN"||_15a==="DIV"){ return elem.childNodes; } -_1ec.push(name); -_1ed.push(elem.value||""); +_154.push(name); +_155.push(elem.value||""); return null; } return elem.childNodes; }); -return [_1ec,_1ed]; +return [_154,_155]; },withDocument:function(doc,func){ var self=MochiKit.DOM; -var _1fb=self._document; +var _163=self._document; var rval; try{ self._document=doc; rval=func(); } catch(e){ -self._document=_1fb; +self._document=_163; throw e; } -self._document=_1fb; +self._document=_163; return rval; -},registerDOMConverter:function(name,_1fe,wrap,_200){ -MochiKit.DOM.domConverters.register(name,_1fe,wrap,_200); +},registerDOMConverter:function(name,_166,wrap,_168){ +MochiKit.DOM.domConverters.register(name,_166,wrap,_168); },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 _16f=im.repeat; var map=m.map; } -var _209=self.domConverters; -var _20a=arguments.callee; -var _20b=m.NotFound; +var _171=self.domConverters; +var _172=arguments.callee; +var _173=m.NotFound; while(true){ if(typeof (node)=="undefined"||node===null){ return null; @@ -1792,49 +1180,49 @@ node=node.apply(ctx,[ctx]); continue; } if(im){ -var _20c=null; +var _174=null; try{ -_20c=iter(node); +_174=iter(node); } catch(e){ } -if(_20c){ -return map(_20a,_20c,_207(ctx)); +if(_174){ +return map(_172,_174,_16f(ctx)); } } try{ -node=_209.match(node,ctx); +node=_171.match(node,ctx); continue; } catch(e){ -if(e!=_20b){ +if(e!=_173){ throw e; } } return self._document.createTextNode(node.toString()); } return undefined; -},isChildNode:function(node,_20e){ +},isChildNode:function(node,_176){ var self=MochiKit.DOM; if(typeof (node)=="string"){ node=self.getElement(node); } -if(typeof (_20e)=="string"){ -_20e=self.getElement(_20e); +if(typeof (_176)=="string"){ +_176=self.getElement(_176); } -if(node===_20e){ +if(node===_176){ return true; } while(node&&node.tagName.toUpperCase()!="BODY"){ node=node.parentNode; -if(node===_20e){ +if(node===_176){ return true; } } return false; -},setNodeAttribute:function(node,attr,_212){ +},setNodeAttribute:function(node,attr,_17a){ var o={}; -o[attr]=_212; +o[attr]=_17a; try{ return MochiKit.DOM.updateNodeAttributes(node,o); } @@ -1843,11 +1231,11 @@ catch(e){ return null; },getNodeAttribute:function(node,attr){ var self=MochiKit.DOM; -var _217=self.attributeArray.renames[attr]; +var _17f=self.attributeArray.renames[attr]; node=self.getElement(node); try{ -if(_217){ -return node[_217]; +if(_17f){ +return node[_17f]; } return node.getAttribute(attr); } @@ -1856,33 +1244,33 @@ catch(e){ return null; },removeNodeAttribute:function(node,attr){ var self=MochiKit.DOM; -var _21b=self.attributeArray.renames[attr]; +var _183=self.attributeArray.renames[attr]; node=self.getElement(node); try{ -if(_21b){ -return node[_21b]; +if(_183){ +return node[_183]; } return node.removeAttribute(attr); } catch(e){ } return null; -},updateNodeAttributes:function(node,_21d){ +},updateNodeAttributes:function(node,_185){ var elem=node; var self=MochiKit.DOM; if(typeof (node)=="string"){ elem=self.getElement(node); } -if(_21d){ -var _220=MochiKit.Base.updatetree; +if(_185){ +var _188=MochiKit.Base.updatetree; if(self.attributeArray.compliant){ -for(var k in _21d){ -var v=_21d[k]; +for(var k in _185){ +var v=_185[k]; if(typeof (v)=="object"&&typeof (elem[k])=="object"){ if(k=="style"&&MochiKit.Style){ MochiKit.Style.setStyle(elem,v); }else{ -_220(elem[k],v); +_188(elem[k],v); } }else{ if(k.substring(0,2)=="on"){ @@ -1896,21 +1284,21 @@ elem.setAttribute(k,v); } } }else{ -var _223=self.attributeArray.renames; -for(var k in _21d){ -v=_21d[k]; -var _224=_223[k]; +var _18b=self.attributeArray.renames; +for(var k in _185){ +v=_185[k]; +var _18c=_18b[k]; if(k=="style"&&typeof (v)=="string"){ elem.style.cssText=v; }else{ -if(typeof (_224)=="string"){ -elem[_224]=v; +if(typeof (_18c)=="string"){ +elem[_18c]=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); +_188(elem[k],v); } }else{ if(k.substring(0,2)=="on"){ @@ -1934,16 +1322,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 _190=[self.coerceToDOM(MochiKit.Base.extend(null,arguments,1),elem)]; +var _191=MochiKit.Base.concat; +while(_190.length){ +var n=_190.shift(); if(typeof (n)=="undefined"||n===null){ }else{ if(typeof (n.nodeType)=="number"){ elem.appendChild(n); }else{ -_228=_229(n,_228); +_190=_191(n,_190); } } } @@ -1954,32 +1342,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 _196=[self.coerceToDOM(MochiKit.Base.extend(null,arguments,1),elem)]; +var _197=elem.parentNode; +var _198=MochiKit.Base.concat; +while(_196.length){ +var n=_196.shift(); if(typeof (n)=="undefined"||n===null){ }else{ if(typeof (n.nodeType)=="number"){ -_22f.insertBefore(n,elem); +_197.insertBefore(n,elem); }else{ -_22e=_230(n,_22e); +_196=_198(n,_196); } } } -return _22f; +return _197; },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 _19d=[self.coerceToDOM(MochiKit.Base.extend(null,arguments,1),elem)]; if(elem.nextSibling){ -return self.insertSiblingNodesBefore(elem.nextSibling,_235); +return self.insertSiblingNodesBefore(elem.nextSibling,_19d); }else{ -return self.appendChildNodes(elem.parentNode,_235); +return self.appendChildNodes(elem.parentNode,_19d); } },replaceChildNodes:function(node){ var elem=node; @@ -1988,40 +1376,40 @@ if(typeof (node)=="string"){ elem=self.getElement(node); arguments[0]=elem; } -var _239; -while((_239=elem.firstChild)){ -elem.removeChild(_239); +var _1a1; +while((_1a1=elem.firstChild)){ +elem.removeChild(_1a1); } if(arguments.length<2){ return elem; }else{ return self.appendChildNodes.apply(this,arguments); } -},createDOM:function(name,_23b){ +},createDOM:function(name,_1a3){ var elem; var self=MochiKit.DOM; var m=MochiKit.Base; -if(typeof (_23b)=="string"||typeof (_23b)=="number"){ +if(typeof (_1a3)=="string"||typeof (_1a3)=="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 _1a8=self._xhtml; +if(_1a3&&!self.attributeArray.compliant){ +var _1a9=""; +if("name" in _1a3){ +_1a9+=" name=\""+self.escapeHTML(_1a3.name)+"\""; } -if(name=="input"&&"type" in _23b){ -_241+=" type=\""+self.escapeHTML(_23b.type)+"\""; +if(name=="input"&&"type" in _1a3){ +_1a9+=" type=\""+self.escapeHTML(_1a3.type)+"\""; } -if(_241){ -name="<"+name+_241+">"; -_240=false; +if(_1a9){ +name="<"+name+_1a9+">"; +_1a8=false; } } var d=self._document; -if(_240&&d===document){ +if(_1a8&&d===document){ elem=d.createElementNS("http://www.w3.org/1999/xhtml",name); }else{ elem=d.createElement(name); @@ -2029,8 +1417,8 @@ elem=d.createElement(name); }else{ elem=name; } -if(_23b){ -self.updateNodeAttributes(elem,_23b); +if(_1a3){ +self.updateNodeAttributes(elem,_1a3); } if(arguments.length<=2){ return elem; @@ -2048,12 +1436,12 @@ return e; },swapDOM:function(dest,src){ var self=MochiKit.DOM; dest=self.getElement(dest); -var _249=dest.parentNode; +var _1b1=dest.parentNode; if(src){ src=self.getElement(src); -_249.replaceChild(src,dest); +_1b1.replaceChild(src,dest); }else{ -_249.removeChild(dest); +_1b1.removeChild(dest); } return src; },getElement:function(id){ @@ -2063,40 +1451,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(_1b4,_1b5,_1b6){ var self=MochiKit.DOM; -if(typeof (_24c)=="undefined"||_24c===null){ -_24c="*"; +if(typeof (_1b4)=="undefined"||_1b4===null){ +_1b4="*"; } -if(typeof (_24e)=="undefined"||_24e===null){ -_24e=self._document; +if(typeof (_1b6)=="undefined"||_1b6===null){ +_1b6=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); +_1b6=self.getElement(_1b6); +var _1b8=(_1b6.getElementsByTagName(_1b4)||self._document.all); +if(typeof (_1b5)=="undefined"||_1b5===null){ +return MochiKit.Base.extend(null,_1b8); } -var _251=[]; -for(var i=0;i<_250.length;i++){ -var _253=_250[i]; -var cls=_253.className; +var _1b9=[]; +for(var i=0;i<_1b8.length;i++){ +var _1bb=_1b8[i]; +var cls=_1bb.className; if(!cls){ continue; } -var _255=cls.split(" "); -for(var j=0;j<_255.length;j++){ -if(_255[j]==_24d){ -_251.push(_253); +var _1bd=cls.split(" "); +for(var j=0;j<_1bd.length;j++){ +if(_1bd[j]==_1b5){ +_1b9.push(_1bb); break; } } } -return _251; +return _1b9; },_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 _1c2=arguments.callee.callStack; +for(var i=0;i<_1c2.length;i++){ +if(_1c2[i].apply(this,arguments)===false){ break; } } @@ -2110,102 +1498,102 @@ catch(e){ }; rval.callStack=[]; return rval; -},addToCallStack:function(_25c,path,func,once){ +},addToCallStack:function(_1c4,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 _1c9=_1c4[path]; +var _1ca=_1c9; +if(!(typeof (_1c9)=="function"&&typeof (_1c9.callStack)=="object"&&_1c9.callStack!==null)){ +_1ca=self._newCallStack(path,once); +if(typeof (_1c9)=="function"){ +_1ca.callStack.push(_1c9); } -_25c[path]=_262; +_1c4[path]=_1ca; } -_262.callStack.push(func); +_1ca.callStack.push(func); },addLoadEvent:function(func){ var self=MochiKit.DOM; self.addToCallStack(self._window,"onload",func,true); -},focusOnLoad:function(_265){ +},focusOnLoad:function(_1cd){ var self=MochiKit.DOM; self.addLoadEvent(function(){ -_265=self.getElement(_265); -if(_265){ -_265.focus(); +_1cd=self.getElement(_1cd); +if(_1cd){ +_1cd.focus(); } }); -},setElementClass:function(_267,_268){ +},setElementClass:function(_1cf,_1d0){ var self=MochiKit.DOM; -var obj=self.getElement(_267); +var obj=self.getElement(_1cf); if(self.attributeArray.compliant){ -obj.setAttribute("class",_268); +obj.setAttribute("class",_1d0); }else{ -obj.setAttribute("className",_268); +obj.setAttribute("className",_1d0); } -},toggleElementClass:function(_26b){ +},toggleElementClass:function(_1d3){ 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]); +_1f6.push(""); +var _200=dom.childNodes; +for(i=_200.length-1;i>=0;i--){ +_1f6.push(_200[i]); } }else{ lst.push("/>"); } }else{ if(dom.nodeType==3){ -lst.push(_290(dom.nodeValue)); +lst.push(_1f8(dom.nodeValue)); } } } } return lst; -},scrapeText:function(node,_29a){ +},scrapeText:function(node,_202){ var rval=[]; (function(node){ var cn=node.childNodes; @@ -2274,103 +1662,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 _227=this._document.createElement("span"); +var _228; +if(_227&&_227.attributes&&_227.attributes.length>0){ +var _229=m.filter; +_228=function(node){ +return _229(_228.ignoreAttrFilter,node.attributes); +}; +_228.ignoreAttr={}; +var _22b=_227.attributes; +var _22c=_228.ignoreAttr; +for(var i=0;i<_22b.length;i++){ +var a=_22b[i]; +_22c[a.name]=a.value; +} +_228.ignoreAttrFilter=function(a){ +return (_228.ignoreAttr[a.name]!=a.value); +}; +_228.compliant=false; +_228.renames={"class":"className","checked":"defaultChecked","usemap":"useMap","for":"htmlFor","readonly":"readOnly","colspan":"colSpan","bgcolor":"bgColor","cellspacing":"cellSpacing","cellpadding":"cellPadding"}; +}else{ +_228=function(node){ return node.attributes; }; -_2c0.compliant=true; -_2c0.renames={}; +_228.compliant=true; +_228.renames={}; } -this.attributeArray=_2c0; -var _2c9=function(_2ca,arr){ -var _2cc=arr[1].split("."); +this.attributeArray=_228; +var _231=function(_232,arr){ +var _234=arr[1].split("."); var str=""; var obj={}; -str+="if (!MochiKit."+_2cc[1]+") { throw new Error(\""; +str+="if (!MochiKit."+_234[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+=_234[1]+".\");}"; +str+="return MochiKit."+_234[1]+"."+arr[0]; str+=".apply(this, arguments);"; -obj[_2cc[2]]=new Function(str); -MochiKit.Base.update(MochiKit[_2ca],obj); +obj[_234[2]]=new Function(str); +MochiKit.Base.update(MochiKit[_232],obj); }; for(var i;i0.5; @@ -2954,114 +2342,114 @@ 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; +MochiKit.Base.update(MochiKit.Color.Color,{fromRGB:function(red,_2ac,blue,_2ae){ +var _2af=MochiKit.Color.Color; if(arguments.length==1){ var rgb=red; red=rgb.r; -_344=rgb.g; +_2ac=rgb.g; blue=rgb.b; if(typeof (rgb.a)=="undefined"){ -_346=undefined; +_2ae=undefined; }else{ -_346=rgb.a; +_2ae=rgb.a; } } -return new _347(red,_344,blue,_346); -},fromHSL:function(hue,_34a,_34b,_34c){ +return new _2af(red,_2ac,blue,_2ae); +},fromHSL:function(hue,_2b2,_2b3,_2b4){ var m=MochiKit.Color; return m.Color.fromRGB(m.hslToRGB.apply(m,arguments)); -},fromHSV:function(hue,_34f,_350,_351){ +},fromHSV:function(hue,_2b7,_2b8,_2b9){ var m=MochiKit.Color; return m.Color.fromRGB(m.hsvToRGB.apply(m,arguments)); },fromName:function(name){ -var _354=MochiKit.Color.Color; +var _2bc=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); +var _2bd=_2bc._namedColors[name.toLowerCase()]; +if(typeof (_2bd)=="string"){ +return _2bc.fromHexString(_2bd); }else{ if(name=="transparent"){ -return _354.transparentColor(); +return _2bc.transparentColor(); } } return null; -},fromString:function(_356){ +},fromString:function(_2be){ var self=MochiKit.Color.Color; -var _358=_356.substr(0,3); -if(_358=="rgb"){ -return self.fromRGBString(_356); +var _2c0=_2be.substr(0,3); +if(_2c0=="rgb"){ +return self.fromRGBString(_2be); }else{ -if(_358=="hsl"){ -return self.fromHSLString(_356); +if(_2c0=="hsl"){ +return self.fromHSLString(_2be); }else{ -if(_356.charAt(0)=="#"){ -return self.fromHexString(_356); +if(_2be.charAt(0)=="#"){ +return self.fromHexString(_2be); } } } -return self.fromName(_356); -},fromHexString:function(_359){ -if(_359.charAt(0)=="#"){ -_359=_359.substring(1); +return self.fromName(_2be); +},fromHexString:function(_2c1){ +if(_2c1.charAt(0)=="#"){ +_2c1=_2c1.substring(1); } -var _35a=[]; +var _2c2=[]; var i,hex; -if(_359.length==3){ +if(_2c1.length==3){ for(i=0;i<3;i++){ -hex=_359.substr(i,1); -_35a.push(parseInt(hex+hex,16)/255); +hex=_2c1.substr(i,1); +_2c2.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); +hex=_2c1.substr(i,2); +_2c2.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 _2c5=MochiKit.Color.Color; +return _2c5.fromRGB.apply(_2c5,_2c2); +},_fromColorString:function(pre,_2c7,_2c8,_2c9){ +if(_2c9.indexOf(pre)===0){ +_2c9=_2c9.substring(_2c9.indexOf("(",3)+1,_2c9.length-1); } -var _362=_361.split(/\s*,\s*/); -var _363=[]; -for(var i=0;i<_362.length;i++){ -var c=_362[i]; +var _2ca=_2c9.split(/\s*,\s*/); +var _2cb=[]; +for(var i=0;i<_2ca.length;i++){ +var c=_2ca[i]; var val; -var _367=c.substring(c.length-3); +var _2cf=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"){ +if(_2cf=="deg"){ val=parseFloat(c)/360; }else{ -if(_367=="rad"){ +if(_2cf=="rad"){ val=parseFloat(c)/(Math.PI*2); }else{ -val=_360[i]*parseFloat(c); +val=_2c8[i]*parseFloat(c); } } } -_363.push(val); +_2cb.push(val); } -return this[_35f].apply(this,_363); -},fromComputedStyle:function(elem,_369){ +return this[_2c7].apply(this,_2cb); +},fromComputedStyle:function(elem,_2d1){ 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){ +var _2d4=MochiKit.Style.getStyle.apply(d,arguments); +if(!_2d4){ continue; } -var _36d=cls.fromString(_36c); -if(!_36d){ +var _2d5=cls.fromString(_2d4); +if(!_2d5){ break; } -if(_36d.asRGB().a>0){ -return _36d; +if(_2d5.asRGB().a>0){ +return _2d5; } } return null; @@ -3074,13 +2462,13 @@ 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; +MochiKit.Base.update(MochiKit.Color,{clampColorComponent:function(v,_2db){ +v*=_2db; if(v<0){ return 0; }else{ -if(v>_373){ -return _373; +if(v>_2db){ +return _2db; }else{ return v; } @@ -3108,118 +2496,118 @@ val=n1; } } return val; -},hsvToRGB:function(hue,_379,_37a,_37b){ +},hsvToRGB:function(hue,_2e1,_2e2,_2e3){ if(arguments.length==1){ var hsv=hue; hue=hsv.h; -_379=hsv.s; -_37a=hsv.v; -_37b=hsv.a; +_2e1=hsv.s; +_2e2=hsv.v; +_2e3=hsv.a; } var red; -var _37e; +var _2e6; var blue; -if(_379===0){ -red=_37a; -_37e=_37a; -blue=_37a; +if(_2e1===0){ +red=_2e2; +_2e6=_2e2; +blue=_2e2; }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))); +var p=_2e2*(1-_2e1); +var q=_2e2*(1-(_2e1*f)); +var t=_2e2*(1-(_2e1*(1-f))); switch(i){ case 1: red=q; -_37e=_37a; +_2e6=_2e2; blue=p; break; case 2: red=p; -_37e=_37a; +_2e6=_2e2; blue=t; break; case 3: red=p; -_37e=q; -blue=_37a; +_2e6=q; +blue=_2e2; break; case 4: red=t; -_37e=p; -blue=_37a; +_2e6=p; +blue=_2e2; break; case 5: -red=_37a; -_37e=p; +red=_2e2; +_2e6=p; blue=q; break; case 6: case 0: -red=_37a; -_37e=t; +red=_2e2; +_2e6=t; blue=p; break; } } -return {r:red,g:_37e,b:blue,a:_37b}; -},hslToRGB:function(hue,_386,_387,_388){ +return {r:red,g:_2e6,b:blue,a:_2e3}; +},hslToRGB:function(hue,_2ee,_2ef,_2f0){ if(arguments.length==1){ var hsl=hue; hue=hsl.h; -_386=hsl.s; -_387=hsl.l; -_388=hsl.a; +_2ee=hsl.s; +_2ef=hsl.l; +_2f0=hsl.a; } var red; -var _38b; +var _2f3; var blue; -if(_386===0){ -red=_387; -_38b=_387; -blue=_387; +if(_2ee===0){ +red=_2ef; +_2f3=_2ef; +blue=_2ef; }else{ var m2; -if(_387<=0.5){ -m2=_387*(1+_386); +if(_2ef<=0.5){ +m2=_2ef*(1+_2ee); }else{ -m2=_387+_386-(_387*_386); +m2=_2ef+_2ee-(_2ef*_2ee); } -var m1=(2*_387)-m2; +var m1=(2*_2ef)-m2; var f=MochiKit.Color._hslValue; var h6=hue*6; red=f(m1,m2,h6+2); -_38b=f(m1,m2,h6); +_2f3=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){ +return {r:red,g:_2f3,b:blue,a:_2f0}; +},rgbToHSV:function(red,_2fa,blue,_2fc){ if(arguments.length==1){ var rgb=red; red=rgb.r; -_392=rgb.g; +_2fa=rgb.g; blue=rgb.b; -_394=rgb.a; +_2fc=rgb.a; } -var max=Math.max(Math.max(red,_392),blue); -var min=Math.min(Math.min(red,_392),blue); +var max=Math.max(Math.max(red,_2fa),blue); +var min=Math.min(Math.min(red,_2fa),blue); var hue; -var _399; -var _39a=max; +var _301; +var _302=max; if(min==max){ hue=0; -_399=0; +_301=0; }else{ -var _39b=(max-min); -_399=_39b/max; +var _303=(max-min); +_301=_303/max; if(red==max){ -hue=(_392-blue)/_39b; +hue=(_2fa-blue)/_303; }else{ -if(_392==max){ -hue=2+((blue-red)/_39b); +if(_2fa==max){ +hue=2+((blue-red)/_303); }else{ -hue=4+((red-_392)/_39b); +hue=4+((red-_2fa)/_303); } } hue/=6; @@ -3230,37 +2618,37 @@ if(hue>1){ hue-=1; } } -return {h:hue,s:_399,v:_39a,a:_394}; -},rgbToHSL:function(red,_39d,blue,_39f){ +return {h:hue,s:_301,v:_302,a:_2fc}; +},rgbToHSL:function(red,_305,blue,_307){ if(arguments.length==1){ var rgb=red; red=rgb.r; -_39d=rgb.g; +_305=rgb.g; blue=rgb.b; -_39f=rgb.a; +_307=rgb.a; } -var max=Math.max(red,Math.max(_39d,blue)); -var min=Math.min(red,Math.min(_39d,blue)); +var max=Math.max(red,Math.max(_305,blue)); +var min=Math.min(red,Math.min(_305,blue)); var hue; -var _3a4; -var _3a5=(max+min)/2; -var _3a6=max-min; -if(_3a6===0){ +var _30c; +var _30d=(max+min)/2; +var _30e=max-min; +if(_30e===0){ hue=0; -_3a4=0; +_30c=0; }else{ -if(_3a5<=0.5){ -_3a4=_3a6/(max+min); +if(_30d<=0.5){ +_30c=_30e/(max+min); }else{ -_3a4=_3a6/(2-max-min); +_30c=_30e/(2-max-min); } if(red==max){ -hue=(_39d-blue)/_3a6; +hue=(_305-blue)/_30e; }else{ -if(_39d==max){ -hue=2+((blue-red)/_3a6); +if(_305==max){ +hue=2+((blue-red)/_30e); }else{ -hue=4+((red-_39d)/_3a6); +hue=4+((red-_305)/_30e); } } hue/=6; @@ -3271,33 +2659,33 @@ if(hue>1){ hue-=1; } } -return {h:hue,s:_3a4,l:_3a5,a:_39f}; +return {h:hue,s:_30c,l:_30d,a:_307}; },toColorPart:function(num){ num=Math.round(num); -var _3a8=num.toString(16); +var _310=num.toString(16); if(num<16){ -return "0"+_3a8; +return "0"+_310; } -return _3a8; +return _310; },__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 _312=1/3; +var _313={black:[0,0,0],blue:[0,0,1],brown:[0.6,0.4,0.2],cyan:[0,1,1],darkGray:[_312,_312,_312],gray:[0.5,0.5,0.5],green:[0,1,0],lightGray:[2*_312,2*_312,2*_312],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 _314=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){ +for(var k in _313){ var name=k+"Color"; -var _3b5=m.concat([_3ac,this.Color,name],_3ab[k]); -this.Color[name]=m.bind.apply(null,_3b5); +var _31d=m.concat([_314,this.Color,name],_313[k]); +this.Color[name]=m.bind.apply(null,_31d); } -var _3b6=function(){ +var _31e=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=_360.length-1;i>=0;i--){ +var o=_360[i]; if(o.source===src&&o.signal===sig&&o.objOrFunc===obj&&o.funcOrStr===func){ self._disconnect(o); if(!self._lock){ -_3f8.splice(i,1); +_360.splice(i,1); }else{ self._dirty=true; } @@ -3722,11 +3110,11 @@ return true; } } }else{ -var idx=m.findIdentical(_3f8,_3f6); +var idx=m.findIdentical(_360,_35e); if(idx>=0){ -self._disconnect(_3f6); +self._disconnect(_35e); if(!self._lock){ -_3f8.splice(idx,1); +_360.splice(idx,1); }else{ self._dirty=true; } @@ -3734,100 +3122,100 @@ return true; } } return false; -},disconnectAllTo:function(_401,_402){ +},disconnectAllTo:function(_369,_36a){ 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 _36c=self._observers; +var _36d=self._disconnect; +var _36e=self._lock; +var _36f=self._dirty; +if(typeof (_36a)==="undefined"){ +_36a=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=_36c.length-1;i>=0;i--){ +var _371=_36c[i]; +if(_371.objOrFunc===_369&&(_36a===null||_371.funcOrStr===_36a)){ +_36d(_371); +if(_36e){ +_36f=true; }else{ -_404.splice(i,1); +_36c.splice(i,1); } } } -self._dirty=_407; +self._dirty=_36f; },disconnectAll:function(src,sig){ src=MochiKit.DOM.getElement(src); var m=MochiKit.Base; -var _40d=m.flattenArguments(m.extend(null,arguments,1)); +var _375=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 _377=self._disconnect; +var _378=self._observers; +var i,_37a; +var _37b=self._lock; +var _37c=self._dirty; +if(_375.length===0){ +for(i=_378.length-1;i>=0;i--){ +_37a=_378[i]; +if(_37a.source===src){ +_377(_37a); +if(!_37b){ +_378.splice(i,1); }else{ -_414=true; +_37c=true; } } } }else{ var sigs={}; -for(i=0;i<_40d.length;i++){ -sigs[_40d[i]]=true; +for(i=0;i<_375.length;i++){ +sigs[_375[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=_378.length-1;i>=0;i--){ +_37a=_378[i]; +if(_37a.source===src&&_37a.signal in sigs){ +_377(_37a); +if(!_37b){ +_378.splice(i,1); }else{ -_414=true; +_37c=true; } } } } -self._dirty=_414; +self._dirty=_37c; },signal:function(src,sig){ var self=MochiKit.Signal; -var _419=self._observers; +var _381=self._observers; src=MochiKit.DOM.getElement(src); var args=MochiKit.Base.extend(null,arguments,2); -var _41b=[]; +var _383=[]; 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<_381.length;i++){ +var _385=_381[i]; +if(_385.source===src&&_385.signal===sig){ try{ -_41d.listener.apply(src,args); +_385.listener.apply(src,args); } catch(e){ -_41b.push(e); +_383.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=_381.length-1;i>=0;i--){ +if(!_381[i].connected){ +_381.splice(i,1); } } } -if(_41b.length==1){ -throw _41b[0]; +if(_383.length==1){ +throw _383[0]; }else{ -if(_41b.length>1){ +if(_383.length>1){ var e=new Error("Multiple errors thrown in handling 'sig', see errors property"); -e.errors=_41b; +e.errors=_383; throw e; } } @@ -4006,8 +3394,12 @@ return; } var _29=this.element.getContext("2d"); _29.clearRect(0,0,this.width,this.height); -MochiKit.Iter.forEach(this.xlabels,MochiKit.DOM.removeElement); -MochiKit.Iter.forEach(this.ylabels,MochiKit.DOM.removeElement); +for(var i=0;ithis.height){ -_43.style.bottom="0px"; +_42.style.bottom="0px"; }else{ -_43.style.top=top+"px"; +_42.style.top=top+"px"; } -_43.style.left="0px"; -_43.style.textAlign="right"; -_43.style.width=this.options.yAxisLabelWidth+"px"; -MochiKit.DOM.appendChildNodes(this.container,_43); -this.ylabels.push(_43); -}; -MochiKit.Iter.forEach(this.layout.yticks,bind(_41,this)); -var _45=this.ylabels[0]; -var _46=this.options.axisLabelFontSize; -var _47=parseInt(_45.style.top)+_46; -if(_47>this.height-_46){ -_45.style.top=(parseInt(_45.style.top)-_46/2)+"px"; +_42.style.left="0px"; +_42.style.textAlign="right"; +_42.style.width=this.options.yAxisLabelWidth+"px"; +MochiKit.DOM.appendChildNodes(this.container,_42); +this.ylabels.push(_42); +} +var _44=this.ylabels[0]; +var _45=this.options.axisLabelFontSize; +var _46=parseInt(_44.style.top)+_45; +if(_46>this.height-_45){ +_44.style.top=(parseInt(_44.style.top)-_45/2)+"px"; } } _39.beginPath(); @@ -4120,35 +3512,35 @@ _39.stroke(); } if(this.options.drawXAxis){ if(this.layout.xticks){ -var _41=function(_48){ +for(var i=0;ithis.width){ -_50=this.width-this.options.xAxisLabelWidth; -_49.style.textAlign="right"; -} -if(_50<0){ -_50=0; -_49.style.textAlign="left"; -} -_49.style.left=_50+"px"; -_49.style.width=this.options.xAxisLabelWidth+"px"; -MochiKit.DOM.appendChildNodes(this.container,_49); -this.xlabels.push(_49); -}; -MochiKit.Iter.forEach(this.layout.xticks,bind(_41,this)); +var _42=DIV(_40,_41[1]); +_42.style.textAlign="center"; +_42.style.bottom="0px"; +var _47=(x-this.options.axisLabelWidth/2); +if(_47+this.options.axisLabelWidth>this.width){ +_47=this.width-this.options.xAxisLabelWidth; +_42.style.textAlign="right"; +} +if(_47<0){ +_47=0; +_42.style.textAlign="left"; +} +_42.style.left=_47+"px"; +_42.style.width=this.options.xAxisLabelWidth+"px"; +MochiKit.DOM.appendChildNodes(this.container,_42); +this.xlabels.push(_42); +} } _39.beginPath(); _39.moveTo(this.area.x,this.area.y+this.area.h); @@ -4159,57 +3551,57 @@ _39.stroke(); _39.restore(); }; DygraphCanvasRenderer.prototype._renderLineChart=function(){ -var _51=this.element.getContext("2d"); -var _52=this.options.colorScheme.length; -var _53=this.options.colorScheme; -var _54=MochiKit.Base.keys(this.layout.datasets); -var _55=this.layout.options.errorBars; -var _56=_54.length; -var _57=MochiKit.Base.bind; -var _58=MochiKit.Base.partial; -var _59=function(_60){ -_60.canvasx=this.area.w*_60.x+this.area.x; -_60.canvasy=this.area.h*_60.y+this.area.y; -}; -MochiKit.Iter.forEach(this.layout.points,_59,this); -var _61=function(x){ +var _48=this.element.getContext("2d"); +var _49=this.options.colorScheme.length; +var _50=this.options.colorScheme; +var _51=MochiKit.Base.keys(this.layout.datasets); +var _52=this.layout.options.errorBars; +var _53=_51.length; +var _54=MochiKit.Base.bind; +var _55=MochiKit.Base.partial; +for(var i=0;i=0){ -_81.moveTo(_76,_77[0]); -_81.lineTo(_82.canvasx,_83[0]); -_81.lineTo(_82.canvasx,_83[1]); -_81.lineTo(_76,_77[1]); -_81.closePath(); +var _78=[_77.y-_77.errorPlus*_74,_77.y+_77.errorMinus*_74]; +_78[0]=this.area.h*_78[0]+this.area.y; +_78[1]=this.area.h*_78[1]+this.area.y; +if(_71>=0){ +_76.moveTo(_71,_72[0]); +_76.lineTo(_77.canvasx,_78[0]); +_76.lineTo(_77.canvasx,_78[1]); +_76.lineTo(_71,_72[1]); +_76.closePath(); } -_77[0]=_83[0]; -_77[1]=_83[1]; -_76=_82.canvasx; +_72[0]=_78[0]; +_72[1]=_78[1]; +_71=_77.canvasx; } }; -var _84=_74.colorWithAlpha(0.15); -ctx.fillStyle=_84.toRGBString(); +var _79=_69.colorWithAlpha(0.15); +ctx.fillStyle=_79.toRGBString(); ctx.beginPath(); -MochiKit.Iter.forEach(this.layout.points,_58(_80,ctx),this); +MochiKit.Iter.forEach(this.layout.points,_55(_75,ctx),this); ctx.fill(); } }; -if(_55){ -_57(_72,this)(_51); +if(_52){ +_54(_67,this)(_48); } -_57(_62,this)(_51); -_51.restore(); +_54(_58,this)(_48); +_48.restore(); }; -Dygraph=function(div,_86,_87){ +Dygraph=function(div,_81,_82){ if(arguments.length>0){ if(arguments.length==4){ this.warn("Using deprecated four-argument dygraph constructor"); -this.__old_init__(div,_86,arguments[2],arguments[3]); +this.__old_init__(div,_81,arguments[2],arguments[3]); }else{ -this.__init__(div,_86,_87); +this.__init__(div,_81,_82); } } }; @@ -4291,28 +3683,28 @@ Dygraph.DEBUG=1; Dygraph.INFO=2; Dygraph.WARNING=3; Dygraph.ERROR=3; -Dygraph.prototype.__old_init__=function(div,_88,_89,_90){ -if(_89!=null){ -var _91=["Date"]; -for(var i=0;i<_89.length;i++){ -_91.push(_89[i]); +Dygraph.prototype.__old_init__=function(div,_83,_84,_85){ +if(_84!=null){ +var _86=["Date"]; +for(var i=0;i<_84.length;i++){ +_86.push(_84[i]); } -MochiKit.Base.update(_90,{"labels":_91}); +MochiKit.Base.update(_85,{"labels":_86}); } -this.__init__(div,_88,_90); +this.__init__(div,_83,_85); }; -Dygraph.prototype.__init__=function(div,_92,_93){ -if(_93==null){ -_93={}; +Dygraph.prototype.__init__=function(div,_87,_88){ +if(_88==null){ +_88={}; } this.maindiv_=div; -this.file_=_92; -this.rollPeriod_=_93.rollPeriod||Dygraph.DEFAULT_ROLL_PERIOD; +this.file_=_87; +this.rollPeriod_=_88.rollPeriod||Dygraph.DEFAULT_ROLL_PERIOD; this.previousVerticalX_=-1; -this.fractions_=_93.fractions||false; -this.dateWindow_=_93.dateWindow||null; -this.valueRange_=_93.valueRange||null; -this.wilsonInterval_=_93.wilsonInterval||true; +this.fractions_=_88.fractions||false; +this.dateWindow_=_88.dateWindow||null; +this.valueRange_=_88.valueRange||null; +this.wilsonInterval_=_88.wilsonInterval||true; div.innerHTML=""; if(div.style.width==""){ div.style.width=Dygraph.DEFAULT_WIDTH+"px"; @@ -4323,7 +3715,7 @@ 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_,_93); +MochiKit.Base.update(this.user_attrs_,_88); this.attrs_={}; MochiKit.Base.update(this.attrs_,Dygraph.DEFAULT_ATTRS); this.labelsFromCSV_=(this.attr_("labels")==null); @@ -4341,53 +3733,53 @@ this.createRollInterface_(); this.createDragInterface_(); this.start_(); }; -Dygraph.prototype.attr_=function(_94){ -if(typeof (this.user_attrs_[_94])!="undefined"){ -return this.user_attrs_[_94]; +Dygraph.prototype.attr_=function(_89){ +if(typeof (this.user_attrs_[_89])!="undefined"){ +return this.user_attrs_[_89]; }else{ -if(typeof (this.attrs_[_94])!="undefined"){ -return this.attrs_[_94]; +if(typeof (this.attrs_[_89])!="undefined"){ +return this.attrs_[_89]; }else{ return null; } } }; -Dygraph.prototype.log=function(_95,_96){ +Dygraph.prototype.log=function(_90,_91){ if(typeof (console)!="undefined"){ -switch(_95){ +switch(_90){ case Dygraph.DEBUG: -console.debug("dygraphs: "+_96); +console.debug("dygraphs: "+_91); break; case Dygraph.INFO: -console.info("dygraphs: "+_96); +console.info("dygraphs: "+_91); break; case Dygraph.WARNING: -console.warn("dygraphs: "+_96); +console.warn("dygraphs: "+_91); break; case Dygraph.ERROR: -console.error("dygraphs: "+_96); +console.error("dygraphs: "+_91); break; } } }; -Dygraph.prototype.info=function(_97){ -this.log(Dygraph.INFO,_97); +Dygraph.prototype.info=function(_92){ +this.log(Dygraph.INFO,_92); }; -Dygraph.prototype.warn=function(_98){ -this.log(Dygraph.WARNING,_98); +Dygraph.prototype.warn=function(_93){ +this.log(Dygraph.WARNING,_93); }; -Dygraph.prototype.error=function(_99){ -this.log(Dygraph.ERROR,_99); +Dygraph.prototype.error=function(_94){ +this.log(Dygraph.ERROR,_94); }; Dygraph.prototype.rollPeriod=function(){ return this.rollPeriod_; }; Dygraph.prototype.createInterface_=function(){ -var _100=this.maindiv_; +var _95=this.maindiv_; this.graphDiv=MochiKit.DOM.DIV({style:{"width":this.width_+"px","height":this.height_+"px"}}); -appendChildNodes(_100,this.graphDiv); -var _101=MochiKit.DOM.CANVAS; -this.canvas_=_101({style:{"position":"absolute"},width:this.width_,height:this.height_}); +appendChildNodes(_95,this.graphDiv); +var _96=MochiKit.DOM.CANVAS; +this.canvas_=_96({style:{"position":"absolute"},width:this.width_,height:this.height_}); appendChildNodes(this.graphDiv,this.canvas_); this.hidden_=this.createPlotKitCanvas_(this.canvas_); connect(this.hidden_,"onmousemove",this,function(e){ @@ -4397,11 +3789,11 @@ connect(this.hidden_,"onmouseout",this,function(e){ this.mouseOut_(e); }); }; -Dygraph.prototype.createPlotKitCanvas_=function(_103){ +Dygraph.prototype.createPlotKitCanvas_=function(_98){ var h=document.createElement("canvas"); h.style.position="absolute"; -h.style.top=_103.style.top; -h.style.left=_103.style.left; +h.style.top=_98.style.top; +h.style.left=_98.style.left; h.width=this.width_; h.height=this.height_; MochiKit.DOM.appendChildNodes(this.graphDiv,h); @@ -4410,8 +3802,8 @@ return h; Dygraph.prototype.setColors_=function(){ var num=this.attr_("labels").length-1; this.colors_=[]; -var _106=this.attr_("colors"); -if(!_106){ +var _101=this.attr_("colors"); +if(!_101){ var sat=this.attr_("colorSaturation")||1; var val=this.attr_("colorValue")||0.5; for(var i=1;i<=num;i++){ @@ -4420,8 +3812,8 @@ this.colors_.push(MochiKit.Color.Color.fromHSV(hue,sat,val)); } }else{ for(var i=0;i=10){ -self.doZoom_(Math.min(_122,_124),Math.max(_122,_124)); +connect(this.hidden_,"onmouseup",this,function(_130){ +if(_116){ +_116=false; +_119=getX(_130); +_120=getY(_130); +var _131=Math.abs(_119-_117); +var _132=Math.abs(_120-_118); +if(_131<2&&_132<2&&self.attr_("clickCallback")!=null&&self.lastx_!=undefined){ +self.attr_("clickCallback")(_130,new Date(self.lastx_)); +} +if(_131>=10){ +self.doZoom_(Math.min(_117,_119),Math.max(_117,_119)); }else{ self.canvas_.getContext("2d").clearRect(0,0,self.canvas_.width,self.canvas_.height); } -_122=null; -_123=null; +_117=null; +_118=null; } }); -connect(this.hidden_,"ondblclick",this,function(_138){ +connect(this.hidden_,"ondblclick",this,function(_133){ self.dateWindow_=null; self.drawGraph_(self.rawData_); -var _139=self.rawData_[0][0]; -var _140=self.rawData_[self.rawData_.length-1][0]; +var _134=self.rawData_[0][0]; +var _135=self.rawData_[self.rawData_.length-1][0]; if(self.attr_("zoomCallback")){ -self.attr_("zoomCallback")(_139,_140); +self.attr_("zoomCallback")(_134,_135); } }); }; -Dygraph.prototype.drawZoomRect_=function(_141,endX,_143){ +Dygraph.prototype.drawZoomRect_=function(_136,endX,_138){ var ctx=this.canvas_.getContext("2d"); -if(_143){ -ctx.clearRect(Math.min(_141,_143),0,Math.abs(_141-_143),this.height_); +if(_138){ +ctx.clearRect(Math.min(_136,_138),0,Math.abs(_136-_138),this.height_); } -if(endX&&_141){ +if(endX&&_136){ ctx.fillStyle="rgba(128,128,128,0.33)"; -ctx.fillRect(Math.min(_141,endX),0,Math.abs(endX-_141),this.height_); +ctx.fillRect(Math.min(_136,endX),0,Math.abs(endX-_136),this.height_); } }; -Dygraph.prototype.doZoom_=function(lowX,_145){ -var _146=this.layout_.points; -var _147=null; -var _148=null; -for(var i=0;i<_146.length;i++){ -var cx=_146[i].canvasx; -var x=_146[i].xval; -if(cx_147)){ -_147=x; +Dygraph.prototype.doZoom_=function(lowX,_140){ +var _141=this.layout_.points; +var _142=null; +var _143=null; +for(var i=0;i<_141.length;i++){ +var cx=_141[i].canvasx; +var x=_141[i].xval; +if(cx_142)){ +_142=x; } -if(cx>_145&&(_148==null||x<_148)){ -_148=x; +if(cx>_140&&(_143==null||x<_143)){ +_143=x; } } -if(_147==null){ -_147=_146[0].xval; +if(_142==null){ +_142=_141[0].xval; } -if(_148==null){ -_148=_146[_146.length-1].xval; +if(_143==null){ +_143=_141[_141.length-1].xval; } -this.dateWindow_=[_147,_148]; +this.dateWindow_=[_142,_143]; this.drawGraph_(this.rawData_); if(this.attr_("zoomCallback")){ -this.attr_("zoomCallback")(_147,_148); +this.attr_("zoomCallback")(_142,_143); } }; -Dygraph.prototype.mouseMove_=function(_150){ -var _151=_150.mouse().page.x-Dygraph.findPosX(this.hidden_); -var _152=this.layout_.points; -var _153=-1; -var _154=-1; -var _155=1e+100; +Dygraph.prototype.mouseMove_=function(_145){ +var _146=_145.mouse().page.x-Dygraph.findPosX(this.hidden_); +var _147=this.layout_.points; +var _148=-1; +var _149=-1; +var _150=1e+100; var idx=-1; -for(var i=0;i<_152.length;i++){ -var dist=Math.abs(_152[i].canvasx-_151); -if(dist>_155){ +for(var i=0;i<_147.length;i++){ +var dist=Math.abs(_147[i].canvasx-_146); +if(dist>_150){ break; } -_155=dist; +_150=dist; idx=i; } if(idx>=0){ -_153=_152[idx].xval; +_148=_147[idx].xval; } -if(_151>_152[_152.length-1].canvasx){ -_153=_152[_152.length-1].xval; +if(_146>_147[_147.length-1].canvasx){ +_148=_147[_147.length-1].xval; } -var _158=[]; -for(var i=0;i<_152.length;i++){ -if(_152[i].xval==_153){ -_158.push(_152[i]); +var _153=[]; +for(var i=0;i<_147.length;i++){ +if(_147[i].xval==_148){ +_153.push(_147[i]); } } -var _159=this.attr_("highlightCircleSize"); +var _154=this.attr_("highlightCircleSize"); var ctx=this.canvas_.getContext("2d"); if(this.previousVerticalX_>=0){ var px=this.previousVerticalX_; -ctx.clearRect(px-_159-1,0,2*_159+2,this.height_); +ctx.clearRect(px-_154-1,0,2*_154+2,this.height_); } var isOK=function(x){ return x&&!isNaN(x); }; -if(_158.length>0){ -var _151=_158[0].canvasx; -var _161=this.attr_("xValueFormatter")(_153,this)+":"; +if(_153.length>0){ +var _146=_153[0].canvasx; +var _156=this.attr_("xValueFormatter")(_148,this)+":"; var clen=this.colors_.length; -for(var i=0;i<_158.length;i++){ -if(!isOK(_158[i].canvasy)){ +for(var i=0;i<_153.length;i++){ +if(!isOK(_153[i].canvasy)){ continue; } if(this.attr_("labelsSeparateLines")){ -_161+="
"; +_156+="
"; } -var _163=_158[i]; -_161+=" "+_163.name+":"+this.round_(_163.yval,2); +var _158=_153[i]; +_156+=" "+_158.name+":"+this.round_(_158.yval,2); } -this.attr_("labelsDiv").innerHTML=_161; -this.lastx_=_153; +this.attr_("labelsDiv").innerHTML=_156; +this.lastx_=_148; ctx.save(); -for(var i=0;i<_158.length;i++){ -if(!isOK(_158[i%clen].canvasy)){ +for(var i=0;i<_153.length;i++){ +if(!isOK(_153[i%clen].canvasy)){ continue; } ctx.beginPath(); ctx.fillStyle=this.colors_[i%clen].toRGBString(); -ctx.arc(_151,_158[i%clen].canvasy,_159,0,360,false); +ctx.arc(_146,_153[i%clen].canvasy,_154,0,360,false); ctx.fill(); } ctx.restore(); -this.previousVerticalX_=_151; +this.previousVerticalX_=_146; } }; -Dygraph.prototype.mouseOut_=function(_164){ +Dygraph.prototype.mouseOut_=function(_159){ var ctx=this.canvas_.getContext("2d"); ctx.clearRect(0,0,this.width_,this.height_); this.attr_("labelsDiv").innerHTML=""; @@ -4666,34 +4058,34 @@ return ""+x; } }; Dygraph.prototype.hmsString_=function(date){ -var _166=Dygraph.zeropad; +var _161=Dygraph.zeropad; var d=new Date(date); if(d.getSeconds()){ -return _166(d.getHours())+":"+_166(d.getMinutes())+":"+_166(d.getSeconds()); +return _161(d.getHours())+":"+_161(d.getMinutes())+":"+_161(d.getSeconds()); }else{ if(d.getMinutes()){ -return _166(d.getHours())+":"+_166(d.getMinutes()); +return _161(d.getHours())+":"+_161(d.getMinutes()); }else{ -return _166(d.getHours()); +return _161(d.getHours()); } } }; Dygraph.dateString_=function(date,self){ -var _168=Dygraph.zeropad; +var _163=Dygraph.zeropad; var d=new Date(date); var year=""+d.getFullYear(); -var _170=_168(d.getMonth()+1); -var day=_168(d.getDate()); +var _165=_163(d.getMonth()+1); +var day=_163(d.getDate()); var ret=""; var frac=d.getHours()*3600+d.getMinutes()*60+d.getSeconds(); if(frac){ ret=" "+self.hmsString_(date); } -return year+"/"+_170+"/"+day+ret; +return year+"/"+_165+"/"+day+ret; }; -Dygraph.prototype.round_=function(num,_174){ -var _175=Math.pow(10,_174); -return Math.round(num*_175)/_175; +Dygraph.prototype.round_=function(num,_169){ +var _170=Math.pow(10,_169); +return Math.round(num*_170)/_170; }; Dygraph.prototype.loadedEvent_=function(data){ this.rawData_=this.parseCSV_(data); @@ -4702,16 +4094,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 _177,endDate; +var _172,endDate; if(this.dateWindow_){ -_177=this.dateWindow_[0]; +_172=this.dateWindow_[0]; endDate=this.dateWindow_[1]; }else{ -_177=this.rawData_[0][0]; +_172=this.rawData_[0][0]; endDate=this.rawData_[this.rawData_.length-1][0]; } -var _178=this.attr_("xTicker")(_177,endDate,this); -this.layout_.updateOptions({xTicks:_178}); +var _173=this.attr_("xTicker")(_172,endDate,this); +this.layout_.updateOptions({xTicks:_173}); }; Dygraph.SECONDLY=0; Dygraph.TEN_SECONDLY=1; @@ -4740,161 +4132,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(_179,_180,_181){ -if(_181=Dygraph.DAILY){ -_190.push({v:t,label:new Date(t+3600*1000).strftime(_192)}); +if(frac==0||_184>=Dygraph.DAILY){ +_185.push({v:t,label:new Date(t+3600*1000).strftime(_187)}); }else{ -_190.push({v:t,label:this.hmsString_(t)}); +_185.push({v:t,label:this.hmsString_(t)}); } } }else{ -var _194; -var _195=1; -if(_189==Dygraph.MONTHLY){ -_194=[0,1,2,3,4,5,6,7,8,9,10,11,12]; +var _189; +var _190=1; +if(_184==Dygraph.MONTHLY){ +_189=[0,1,2,3,4,5,6,7,8,9,10,11,12]; }else{ -if(_189==Dygraph.QUARTERLY){ -_194=[0,3,6,9]; +if(_184==Dygraph.QUARTERLY){ +_189=[0,3,6,9]; }else{ -if(_189==Dygraph.BIANNUAL){ -_194=[0,6]; +if(_184==Dygraph.BIANNUAL){ +_189=[0,6]; }else{ -if(_189==Dygraph.ANNUAL){ -_194=[0]; +if(_184==Dygraph.ANNUAL){ +_189=[0]; }else{ -if(_189==Dygraph.DECADAL){ -_194=[0]; -_195=10; +if(_184==Dygraph.DECADAL){ +_189=[0]; +_190=10; } } } } } -var _196=new Date(_187).getFullYear(); -var _197=new Date(_188).getFullYear(); -var _198=Dygraph.zeropad; -for(var i=_196;i<=_197;i++){ -if(i%_195!=0){ +var _191=new Date(_182).getFullYear(); +var _192=new Date(_183).getFullYear(); +var _193=Dygraph.zeropad; +for(var i=_191;i<=_192;i++){ +if(i%_190!=0){ continue; } -for(var j=0;j<_194.length;j++){ -var _199=i+"/"+_198(1+_194[j])+"/01"; -var t=Date.parse(_199); -if(t<_187||t>_188){ +for(var j=0;j<_189.length;j++){ +var _194=i+"/"+_193(1+_189[j])+"/01"; +var t=Date.parse(_194); +if(t<_182||t>_183){ continue; } -_190.push({v:t,label:new Date(t).strftime("%b %y")}); +_185.push({v:t,label:new Date(t).strftime("%b %y")}); } } } -return _190; +return _185; }; -Dygraph.dateTicker=function(_200,_201,self){ -var _202=-1; +Dygraph.dateTicker=function(_195,_196,self){ +var _197=-1; for(var i=0;i=self.attr_("pixelsPerXLabel")){ -_202=i; +var _198=self.NumXTicks(_195,_196,i); +if(self.width_/_198>=self.attr_("pixelsPerXLabel")){ +_197=i; break; } } -if(_202>=0){ -return self.GetXAxis(_200,_201,_202); +if(_197>=0){ +return self.GetXAxis(_195,_196,_197); }else{ } }; Dygraph.numericTicks=function(minV,maxV,self){ -var _206=[1,2,5]; -var _207,low_val,high_val,nTicks; -var _208=self.attr_("pixelsPerYLabel"); +var _201=[1,2,5]; +var _202,low_val,high_val,nTicks; +var _203=self.attr_("pixelsPerYLabel"); for(var i=-10;i<50;i++){ -var _209=Math.pow(10,i); -for(var j=0;j<_206.length;j++){ -_207=_209*_206[j]; -low_val=Math.floor(minV/_207)*_207; -high_val=Math.ceil(maxV/_207)*_207; -nTicks=(high_val-low_val)/_207; -var _210=self.height_/nTicks; -if(_210>_208){ +var _204=Math.pow(10,i); +for(var j=0;j<_201.length;j++){ +_202=_204*_201[j]; +low_val=Math.floor(minV/_202)*_202; +high_val=Math.ceil(maxV/_202)*_202; +nTicks=(high_val-low_val)/_202; +var _205=self.height_/nTicks; +if(_205>_203){ break; } } -if(_210>_208){ +if(_205>_203){ break; } } -var _211=[]; +var _206=[]; for(var i=0;i=k*k*k){ -_213=self.round_(_212/(k*k*k),1)+"B"; +if(_207>=k*k*k){ +_208=self.round_(_207/(k*k*k),1)+"B"; }else{ -if(_212>=k*k){ -_213=self.round_(_212/(k*k),1)+"M"; +if(_207>=k*k){ +_208=self.round_(_207/(k*k),1)+"M"; }else{ -if(_212>=k){ -_213=self.round_(_212/k,1)+"K"; +if(_207>=k){ +_208=self.round_(_207/k,1)+"K"; } } } } -_211.push({label:_213,v:_212}); +_206.push({label:_208,v:_207}); } -return _211; +return _206; }; Dygraph.prototype.addYTicks_=function(minY,maxY){ -var _217=Dygraph.numericTicks(minY,maxY,this); -this.layout_.updateOptions({yAxis:[minY,maxY],yTicks:_217}); +var _212=Dygraph.numericTicks(minY,maxY,this); +this.layout_.updateOptions({yAxis:[minY,maxY],yTicks:_212}); }; -Dygraph.prototype.extremeValues_=function(_218){ +Dygraph.prototype.extremeValues_=function(_213){ var minY=null,maxY=null; var bars=this.attr_("errorBars")||this.attr_("customBars"); if(bars){ -for(var j=0;j<_218.length;j++){ -var y=_218[j][1][0]; +for(var j=0;j<_213.length;j++){ +var y=_213[j][1][0]; if(!y){ continue; } -var low=y-_218[j][1][1]; -var high=y+_218[j][1][2]; +var low=y-_213[j][1][1]; +var high=y+_213[j][1][2]; if(low>y){ low=y; } @@ -4909,8 +4301,8 @@ minY=low; } } }else{ -for(var j=0;j<_218.length;j++){ -var y=_218[j][1]; +for(var j=0;j<_213.length;j++){ +var y=_213[j][1]; if(!y){ continue; } @@ -4930,64 +4322,64 @@ this.layout_.removeAllDatasets(); this.setColors_(); this.attrs_["pointSize"]=0.5*this.attr_("highlightCircleSize"); for(var i=1;i=low&&_222[k][0]<=high){ -_223.push(_222[k]); +var _218=[]; +for(var k=0;k<_217.length;k++){ +if(_217[k][0]>=low&&_217[k][0]<=high){ +_218.push(_217[k]); } } -_222=_223; +_217=_218; } -var _224=this.extremeValues_(_222); -var _225=_224[0]; -var _226=_224[1]; -if(!minY||_225maxY){ -maxY=_226; +if(!maxY||_221>maxY){ +maxY=_221; } if(bars){ var vals=[]; -for(var j=0;j<_222.length;j++){ -vals[j]=[_222[j][0],_222[j][1][0],_222[j][1][1],_222[j][1][2]]; +for(var j=0;j<_217.length;j++){ +vals[j]=[_217[j][0],_217[j][1][0],_217[j][1][1],_217[j][1][2]]; } this.layout_.addDataset(this.attr_("labels")[i],vals); }else{ -this.layout_.addDataset(this.attr_("labels")[i],_222); +this.layout_.addDataset(this.attr_("labels")[i],_217); } } if(this.valueRange_!=null){ this.addYTicks_(this.valueRange_[0],this.valueRange_[1]); }else{ var span=maxY-minY; -var _229=maxY+0.1*span; -var _230=minY-0.1*span; -if(_230<0&&minY>=0){ -_230=0; +var _224=maxY+0.1*span; +var _225=minY-0.1*span; +if(_225<0&&minY>=0){ +_225=0; } -if(_229>0&&maxY<=0){ -_229=0; +if(_224>0&&maxY<=0){ +_224=0; } if(this.attr_("includeZero")){ if(maxY<0){ -_229=0; +_224=0; } if(minY>0){ -_230=0; +_225=0; } } -this.addYTicks_(_230,_229); +this.addYTicks_(_225,_224); } this.addXTicks_(); this.layout_.evaluateWithError(); @@ -4995,44 +4387,44 @@ this.plotter_.clear(); this.plotter_.render(); this.canvas_.getContext("2d").clearRect(0,0,this.canvas_.width,this.canvas_.height); }; -Dygraph.prototype.rollingAverage=function(_231,_232){ -if(_231.length<2){ -return _231; +Dygraph.prototype.rollingAverage=function(_226,_227){ +if(_226.length<2){ +return _226; } -var _232=Math.min(_232,_231.length-1); -var _233=[]; -var _234=this.attr_("sigma"); +var _227=Math.min(_227,_226.length-1); +var _228=[]; +var _229=this.attr_("sigma"); if(this.fractions_){ var num=0; var den=0; var mult=100; -for(var i=0;i<_231.length;i++){ -num+=_231[i][1][0]; -den+=_231[i][1][1]; -if(i-_232>=0){ -num-=_231[i-_232][1][0]; -den-=_231[i-_232][1][1]; -} -var date=_231[i][0]; -var _237=den?num/den:0; +for(var i=0;i<_226.length;i++){ +num+=_226[i][1][0]; +den+=_226[i][1][1]; +if(i-_227>=0){ +num-=_226[i-_227][1][0]; +den-=_226[i-_227][1][1]; +} +var date=_226[i][0]; +var _232=den?num/den:0; if(this.attr_("errorBars")){ if(this.wilsonInterval_){ if(den){ -var p=_237<0?0:_237,n=den; -var pm=_234*Math.sqrt(p*(1-p)/n+_234*_234/(4*n*n)); -var _240=1+_234*_234/den; -var low=(p+_234*_234/(2*den)-pm)/_240; -var high=(p+_234*_234/(2*den)+pm)/_240; -_233[i]=[date,[p*mult,(p-low)*mult,(high-p)*mult]]; +var p=_232<0?0:_232,n=den; +var pm=_229*Math.sqrt(p*(1-p)/n+_229*_229/(4*n*n)); +var _235=1+_229*_229/den; +var low=(p+_229*_229/(2*den)-pm)/_235; +var high=(p+_229*_229/(2*den)+pm)/_235; +_228[i]=[date,[p*mult,(p-low)*mult,(high-p)*mult]]; }else{ -_233[i]=[date,[0,0,0]]; +_228[i]=[date,[0,0,0]]; } }else{ -var _241=den?_234*Math.sqrt(_237*(1-_237)/den):1; -_233[i]=[date,[mult*_237,mult*_241,mult*_241]]; +var _236=den?_229*Math.sqrt(_232*(1-_232)/den):1; +_228[i]=[date,[mult*_232,mult*_236,mult*_236]]; } }else{ -_233[i]=[date,mult*_237]; +_228[i]=[date,mult*_232]; } } }else{ @@ -5040,105 +4432,105 @@ if(this.attr_("customBars")){ var low=0; var mid=0; var high=0; -var _243=0; -for(var i=0;i<_231.length;i++){ -var data=_231[i][1]; +var _238=0; +for(var i=0;i<_226.length;i++){ +var data=_226[i][1]; var y=data[1]; -_233[i]=[_231[i][0],[y,y-data[0],data[2]-y]]; +_228[i]=[_226[i][0],[y,y-data[0],data[2]-y]]; low+=data[0]; mid+=y; high+=data[2]; -_243+=1; -if(i-_232>=0){ -var prev=_231[i-_232]; +_238+=1; +if(i-_227>=0){ +var prev=_226[i-_227]; low-=prev[1][0]; mid-=prev[1][1]; high-=prev[1][2]; -_243-=1; +_238-=1; } -_233[i]=[_231[i][0],[1*mid/_243,1*(mid-low)/_243,1*(high-mid)/_243]]; +_228[i]=[_226[i][0],[1*mid/_238,1*(mid-low)/_238,1*(high-mid)/_238]]; } }else{ -var _245=Math.min(_232-1,_231.length-2); +var _240=Math.min(_227-1,_226.length-2); if(!this.attr_("errorBars")){ -if(_232==1){ -return _231; +if(_227==1){ +return _226; } -for(var i=0;i<_231.length;i++){ +for(var i=0;i<_226.length;i++){ var sum=0; -var _247=0; -for(var j=Math.max(0,i-_232+1);j=0||str.indexOf("/")>=0||isNaN(parseFloat(str))){ -_252=true; +_247=true; }else{ if(str.length==8&&str>"19700101"&&str<"20371231"){ -_252=true; +_247=true; } } -if(_252){ +if(_247){ this.attrs_.xValueFormatter=Dygraph.dateString_; this.attrs_.xValueParser=Dygraph.dateParser; this.attrs_.xTicker=Dygraph.dateTicker; @@ -5154,57 +4546,57 @@ this.attrs_.xTicker=Dygraph.numericTicks; }; Dygraph.prototype.parseCSV_=function(data){ var ret=[]; -var _253=data.split("\n"); -var _254=0; +var _248=data.split("\n"); +var _249=0; if(this.labelsFromCSV_){ -_254=1; -this.attrs_.labels=_253[0].split(","); -} -var _255; -var _256=false; -var _257=this.attr_("labels").length; -for(var i=_254;i<_253.length;i++){ -var line=_253[i]; +_249=1; +this.attrs_.labels=_248[0].split(","); +} +var _250; +var _251=false; +var _252=this.attr_("labels").length; +for(var i=_249;i<_248.length;i++){ +var line=_248[i]; if(line.length==0){ continue; } -var _259=line.split(","); -if(_259.length<2){ +var _254=line.split(","); +if(_254.length<2){ continue; } -var _260=[]; -if(!_256){ -this.detectTypeFromString_(_259[0]); -_255=this.attr_("xValueParser"); -_256=true; +var _255=[]; +if(!_251){ +this.detectTypeFromString_(_254[0]); +_250=this.attr_("xValueParser"); +_251=true; } -_260[0]=_255(_259[0],this); +_255[0]=_250(_254[0],this); if(this.fractions_){ -for(var j=1;j<_259.length;j++){ -var vals=_259[j].split("/"); -_260[j]=[parseFloat(vals[0]),parseFloat(vals[1])]; +for(var j=1;j<_254.length;j++){ +var vals=_254[j].split("/"); +_255[j]=[parseFloat(vals[0]),parseFloat(vals[1])]; } }else{ if(this.attr_("errorBars")){ -for(var j=1;j<_259.length;j+=2){ -_260[(j+1)/2]=[parseFloat(_259[j]),parseFloat(_259[j+1])]; +for(var j=1;j<_254.length;j+=2){ +_255[(j+1)/2]=[parseFloat(_254[j]),parseFloat(_254[j+1])]; } }else{ if(this.attr_("customBars")){ -for(var j=1;j<_259.length;j++){ -var vals=_259[j].split(";"); -_260[j]=[parseFloat(vals[0]),parseFloat(vals[1]),parseFloat(vals[2])]; +for(var j=1;j<_254.length;j++){ +var vals=_254[j].split(";"); +_255[j]=[parseFloat(vals[0]),parseFloat(vals[1]),parseFloat(vals[2])]; } }else{ -for(var j=1;j<_259.length;j++){ -_260[j]=parseFloat(_259[j]); +for(var j=1;j<_254.length;j++){ +_255[j]=parseFloat(_254[j]); } } } } -ret.push(_260); -if(_260.length!=_257){ -this.error("Number of columns in line "+i+" ("+_260.length+") does not agree with number of labels ("+_257+") "+line); +ret.push(_255); +if(_255.length!=_252){ +this.error("Number of columns in line "+i+" ("+_255.length+") does not agree with number of labels ("+_252+") "+line); } } return ret; @@ -5228,19 +4620,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 _261=MochiKit.Base.clone(data); +var _256=MochiKit.Base.clone(data); for(var i=0;i=0){ this.loadedEvent_(this.file_); }else{ var req=new XMLHttpRequest(); -var _268=this; +var _263=this; req.onreadystatechange=function(){ if(req.readyState==4){ if(req.status==200){ -_268.loadedEvent_(req.responseText); +_263.loadedEvent_(req.responseText); } } }; @@ -5329,36 +4721,36 @@ this.error("Unknown data format: "+(typeof this.file_)); } } }; -Dygraph.prototype.updateOptions=function(_269){ -if(_269.rollPeriod){ -this.rollPeriod_=_269.rollPeriod; +Dygraph.prototype.updateOptions=function(_264){ +if(_264.rollPeriod){ +this.rollPeriod_=_264.rollPeriod; } -if(_269.dateWindow){ -this.dateWindow_=_269.dateWindow; +if(_264.dateWindow){ +this.dateWindow_=_264.dateWindow; } -if(_269.valueRange){ -this.valueRange_=_269.valueRange; +if(_264.valueRange){ +this.valueRange_=_264.valueRange; } -MochiKit.Base.update(this.user_attrs_,_269); +MochiKit.Base.update(this.user_attrs_,_264); this.labelsFromCSV_=(this.attr_("labels")==null); this.layout_.updateOptions({"errorBars":this.attr_("errorBars")}); -if(_269["file"]&&_269["file"]!=this.file_){ -this.file_=_269["file"]; +if(_264["file"]&&_264["file"]!=this.file_){ +this.file_=_264["file"]; this.start_(); }else{ this.drawGraph_(this.rawData_); } }; -Dygraph.prototype.adjustRoll=function(_270){ -this.rollPeriod_=_270; +Dygraph.prototype.adjustRoll=function(_265){ +this.rollPeriod_=_265; this.drawGraph_(this.rawData_); }; -Dygraph.GVizChart=function(_271){ -this.container=_271; +Dygraph.GVizChart=function(_266){ +this.container=_266; }; -Dygraph.GVizChart.prototype.draw=function(data,_272){ +Dygraph.GVizChart.prototype.draw=function(data,_267){ this.container.innerHTML=""; -this.date_graph=new Dygraph(this.container,data,_272); +this.date_graph=new Dygraph(this.container,data,_267); }; DateGraph=Dygraph; diff --git a/generate-combined.sh b/generate-combined.sh index 22799c9..70ee332 100755 --- a/generate-combined.sh +++ b/generate-combined.sh @@ -6,7 +6,7 @@ # Do the same for MochiKit. This save another 77k. cd mochikit_v14 ./scripts/pack.py \ -Base Iter DOM Style Color Signal \ +Base DOM Style Color Signal \ > /tmp/mochikit-packed.js cd .. diff --git a/tests/grid_dot.html b/tests/grid_dot.html index 6ba6d1f..dcec31d 100644 --- a/tests/grid_dot.html +++ b/tests/grid_dot.html @@ -4,7 +4,16 @@ + + + + + + + + -- 2.7.4