From bd597afc25767e952949ff79e8303327a02c6f82 Mon Sep 17 00:00:00 2001 From: Dan Vanderkam Date: Mon, 30 Nov 2009 11:16:23 -0500 Subject: [PATCH] combined is down to 74k! --- dygraph-combined.js | 2297 +++++++++++++-------------------------------------- 1 file changed, 565 insertions(+), 1732 deletions(-) diff --git a/dygraph-combined.js b/dygraph-combined.js index 873160d..946e587 100644 --- a/dygraph-combined.js +++ b/dygraph-combined.js @@ -1493,1181 +1493,6 @@ MochiKit.Color.EXPORT_OK=["clampColorComponent","rgbToHSL","hslToRGB","rgbToHSV" MochiKit.Color.__new__(); MochiKit.Base._exportSymbols(this,MochiKit.Color); MochiKit.Color.Color._namedColors={aliceblue:"#f0f8ff",antiquewhite:"#faebd7",aqua:"#00ffff",aquamarine:"#7fffd4",azure:"#f0ffff",beige:"#f5f5dc",bisque:"#ffe4c4",black:"#000000",blanchedalmond:"#ffebcd",blue:"#0000ff",blueviolet:"#8a2be2",brown:"#a52a2a",burlywood:"#deb887",cadetblue:"#5f9ea0",chartreuse:"#7fff00",chocolate:"#d2691e",coral:"#ff7f50",cornflowerblue:"#6495ed",cornsilk:"#fff8dc",crimson:"#dc143c",cyan:"#00ffff",darkblue:"#00008b",darkcyan:"#008b8b",darkgoldenrod:"#b8860b",darkgray:"#a9a9a9",darkgreen:"#006400",darkgrey:"#a9a9a9",darkkhaki:"#bdb76b",darkmagenta:"#8b008b",darkolivegreen:"#556b2f",darkorange:"#ff8c00",darkorchid:"#9932cc",darkred:"#8b0000",darksalmon:"#e9967a",darkseagreen:"#8fbc8f",darkslateblue:"#483d8b",darkslategray:"#2f4f4f",darkslategrey:"#2f4f4f",darkturquoise:"#00ced1",darkviolet:"#9400d3",deeppink:"#ff1493",deepskyblue:"#00bfff",dimgray:"#696969",dimgrey:"#696969",dodgerblue:"#1e90ff",firebrick:"#b22222",floralwhite:"#fffaf0",forestgreen:"#228b22",fuchsia:"#ff00ff",gainsboro:"#dcdcdc",ghostwhite:"#f8f8ff",gold:"#ffd700",goldenrod:"#daa520",gray:"#808080",green:"#008000",greenyellow:"#adff2f",grey:"#808080",honeydew:"#f0fff0",hotpink:"#ff69b4",indianred:"#cd5c5c",indigo:"#4b0082",ivory:"#fffff0",khaki:"#f0e68c",lavender:"#e6e6fa",lavenderblush:"#fff0f5",lawngreen:"#7cfc00",lemonchiffon:"#fffacd",lightblue:"#add8e6",lightcoral:"#f08080",lightcyan:"#e0ffff",lightgoldenrodyellow:"#fafad2",lightgray:"#d3d3d3",lightgreen:"#90ee90",lightgrey:"#d3d3d3",lightpink:"#ffb6c1",lightsalmon:"#ffa07a",lightseagreen:"#20b2aa",lightskyblue:"#87cefa",lightslategray:"#778899",lightslategrey:"#778899",lightsteelblue:"#b0c4de",lightyellow:"#ffffe0",lime:"#00ff00",limegreen:"#32cd32",linen:"#faf0e6",magenta:"#ff00ff",maroon:"#800000",mediumaquamarine:"#66cdaa",mediumblue:"#0000cd",mediumorchid:"#ba55d3",mediumpurple:"#9370db",mediumseagreen:"#3cb371",mediumslateblue:"#7b68ee",mediumspringgreen:"#00fa9a",mediumturquoise:"#48d1cc",mediumvioletred:"#c71585",midnightblue:"#191970",mintcream:"#f5fffa",mistyrose:"#ffe4e1",moccasin:"#ffe4b5",navajowhite:"#ffdead",navy:"#000080",oldlace:"#fdf5e6",olive:"#808000",olivedrab:"#6b8e23",orange:"#ffa500",orangered:"#ff4500",orchid:"#da70d6",palegoldenrod:"#eee8aa",palegreen:"#98fb98",paleturquoise:"#afeeee",palevioletred:"#db7093",papayawhip:"#ffefd5",peachpuff:"#ffdab9",peru:"#cd853f",pink:"#ffc0cb",plum:"#dda0dd",powderblue:"#b0e0e6",purple:"#800080",red:"#ff0000",rosybrown:"#bc8f8f",royalblue:"#4169e1",saddlebrown:"#8b4513",salmon:"#fa8072",sandybrown:"#f4a460",seagreen:"#2e8b57",seashell:"#fff5ee",sienna:"#a0522d",silver:"#c0c0c0",skyblue:"#87ceeb",slateblue:"#6a5acd",slategray:"#708090",slategrey:"#708090",snow:"#fffafa",springgreen:"#00ff7f",steelblue:"#4682b4",tan:"#d2b48c",teal:"#008080",thistle:"#d8bfd8",tomato:"#ff6347",turquoise:"#40e0d0",violet:"#ee82ee",wheat:"#f5deb3",white:"#ffffff",whitesmoke:"#f5f5f5",yellow:"#ffff00",yellowgreen:"#9acd32"}; -if(typeof (dojo)!="undefined"){ -dojo.provide("MochiKit.DOM"); -dojo.require("MochiKit.Base"); -} -if(typeof (JSAN)!="undefined"){ -JSAN.use("MochiKit.Base",[]); -} -try{ -if(typeof (MochiKit.Base)=="undefined"){ -throw ""; -} -} -catch(e){ -throw "MochiKit.DOM depends on MochiKit.Base!"; -} -if(typeof (MochiKit.DOM)=="undefined"){ -MochiKit.DOM={}; -} -MochiKit.DOM.NAME="MochiKit.DOM"; -MochiKit.DOM.VERSION="1.4"; -MochiKit.DOM.__repr__=function(){ -return "["+this.NAME+" "+this.VERSION+"]"; -}; -MochiKit.DOM.toString=function(){ -return this.__repr__(); -}; -MochiKit.DOM.EXPORT=["removeEmptyTextNodes","formContents","currentWindow","currentDocument","withWindow","withDocument","registerDOMConverter","coerceToDOM","createDOM","createDOMFunc","isChildNode","getNodeAttribute","removeNodeAttribute","setNodeAttribute","updateNodeAttributes","appendChildNodes","insertSiblingNodesAfter","insertSiblingNodesBefore","replaceChildNodes","removeElement","swapDOM","BUTTON","TT","PRE","H1","H2","H3","BR","CANVAS","HR","LABEL","TEXTAREA","FORM","STRONG","SELECT","OPTION","OPTGROUP","LEGEND","FIELDSET","P","UL","OL","LI","TD","TR","THEAD","TBODY","TFOOT","TABLE","TH","INPUT","SPAN","A","DIV","IMG","getElement","$","getElementsByTagAndClassName","addToCallStack","addLoadEvent","focusOnLoad","setElementClass","toggleElementClass","addElementClass","removeElementClass","swapElementClass","hasElementClass","escapeHTML","toHTML","emitHTML","scrapeText","isParent","getFirstParentByTagAndClassName","makeClipping","undoClipping","makePositioned","undoPositioned","getFirstElementByTagAndClassName"]; -MochiKit.DOM.EXPORT_OK=["domConverters"]; -MochiKit.DOM.DEPRECATED=[["computedStyle","MochiKit.Style.getStyle","1.4"],["elementDimensions","MochiKit.Style.getElementDimensions","1.4"],["elementPosition","MochiKit.Style.getElementPosition","1.4"],["hideElement","MochiKit.Style.hideElement","1.4"],["setElementDimensions","MochiKit.Style.setElementDimensions","1.4"],["setElementPosition","MochiKit.Style.setElementPosition","1.4"],["setDisplayForElement","MochiKit.Style.setDisplayForElement","1.4"],["setOpacity","MochiKit.Style.setOpacity","1.4"],["showElement","MochiKit.Style.showElement","1.4"],["Coordinates","MochiKit.Style.Coordinates","1.4"],["Dimensions","MochiKit.Style.Dimensions","1.4"]]; -MochiKit.DOM.getViewportDimensions=new Function(""+"if (!MochiKit[\"Style\"]) {"+" throw new Error(\"This function has been deprecated and depends on MochiKit.Style.\");"+"}"+"return MochiKit.Style.getViewportDimensions.apply(this, arguments);"); -MochiKit.Base.update(MochiKit.DOM,{currentWindow:function(){ -return MochiKit.DOM._window; -},currentDocument:function(){ -return MochiKit.DOM._document; -},withWindow:function(win,func){ -var self=MochiKit.DOM; -var _1f4=self._document; -var _1f5=self._window; -var rval; -try{ -self._window=win; -self._document=win.document; -rval=func(); -} -catch(e){ -self._window=_1f5; -self._document=_1f4; -throw e; -} -self._window=_1f5; -self._document=_1f4; -return rval; -},formContents:function(elem){ -var _1f8=[]; -var _1f9=[]; -var m=MochiKit.Base; -var self=MochiKit.DOM; -if(typeof (elem)=="undefined"||elem===null){ -elem=self._document.body; -}else{ -elem=self.getElement(elem); -} -m.nodeWalk(elem,function(elem){ -var name=elem.name; -if(m.isNotEmpty(name)){ -var _1fe=elem.tagName.toUpperCase(); -if(_1fe==="INPUT"&&(elem.type=="radio"||elem.type=="checkbox")&&!elem.checked){ -return null; -} -if(_1fe==="SELECT"){ -if(elem.type=="select-one"){ -if(elem.selectedIndex>=0){ -var opt=elem.options[elem.selectedIndex]; -var v=opt.value; -if(!v){ -var h=opt.outerHTML; -if(h&&!h.match(/^[^>]+\svalue\s*=/i)){ -v=opt.text; -} -} -_1f8.push(name); -_1f9.push(v); -return null; -} -_1f8.push(name); -_1f9.push(""); -return null; -}else{ -var opts=elem.options; -if(!opts.length){ -_1f8.push(name); -_1f9.push(""); -return null; -} -for(var i=0;i]+\svalue\s*=/i)){ -v=opt.text; -} -} -_1f8.push(name); -_1f9.push(v); -} -return null; -} -} -if(_1fe==="FORM"||_1fe==="P"||_1fe==="SPAN"||_1fe==="DIV"){ -return elem.childNodes; -} -_1f8.push(name); -_1f9.push(elem.value||""); -return null; -} -return elem.childNodes; -}); -return [_1f8,_1f9]; -},withDocument:function(doc,func){ -var self=MochiKit.DOM; -var _207=self._document; -var rval; -try{ -self._document=doc; -rval=func(); -} -catch(e){ -self._document=_207; -throw e; -} -self._document=_207; -return rval; -},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 _213=im.repeat; -var map=m.map; -} -var _215=self.domConverters; -var _216=arguments.callee; -var _217=m.NotFound; -while(true){ -if(typeof (node)=="undefined"||node===null){ -return null; -} -if(typeof (node)=="function"&&typeof (node.length)=="number"&&!(node instanceof Function)){ -node=im.list(node); -} -if(typeof (node.nodeType)!="undefined"&&node.nodeType>0){ -return node; -} -if(typeof (node)=="number"||typeof (node)=="boolean"){ -node=node.toString(); -} -if(typeof (node)=="string"){ -return self._document.createTextNode(node); -} -if(typeof (node.__dom__)=="function"){ -node=node.__dom__(ctx); -continue; -} -if(typeof (node.dom)=="function"){ -node=node.dom(ctx); -continue; -} -if(typeof (node)=="function"){ -node=node.apply(ctx,[ctx]); -continue; -} -if(im){ -var _218=null; -try{ -_218=iter(node); -} -catch(e){ -} -if(_218){ -return map(_216,_218,_213(ctx)); -} -} -try{ -node=_215.match(node,ctx); -continue; -} -catch(e){ -if(e!=_217){ -throw e; -} -} -return self._document.createTextNode(node.toString()); -} -return undefined; -},isChildNode:function(node,_21a){ -var self=MochiKit.DOM; -if(typeof (node)=="string"){ -node=self.getElement(node); -} -if(typeof (_21a)=="string"){ -_21a=self.getElement(_21a); -} -if(node===_21a){ -return true; -} -while(node&&node.tagName.toUpperCase()!="BODY"){ -node=node.parentNode; -if(node===_21a){ -return true; -} -} -return false; -},setNodeAttribute:function(node,attr,_21e){ -var o={}; -o[attr]=_21e; -try{ -return MochiKit.DOM.updateNodeAttributes(node,o); -} -catch(e){ -} -return null; -},getNodeAttribute:function(node,attr){ -var self=MochiKit.DOM; -var _223=self.attributeArray.renames[attr]; -node=self.getElement(node); -try{ -if(_223){ -return node[_223]; -} -return node.getAttribute(attr); -} -catch(e){ -} -return null; -},removeNodeAttribute:function(node,attr){ -var self=MochiKit.DOM; -var _227=self.attributeArray.renames[attr]; -node=self.getElement(node); -try{ -if(_227){ -return node[_227]; -} -return node.removeAttribute(attr); -} -catch(e){ -} -return null; -},updateNodeAttributes:function(node,_229){ -var elem=node; -var self=MochiKit.DOM; -if(typeof (node)=="string"){ -elem=self.getElement(node); -} -if(_229){ -var _22c=MochiKit.Base.updatetree; -if(self.attributeArray.compliant){ -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{ -_22c(elem[k],v); -} -}else{ -if(k.substring(0,2)=="on"){ -if(typeof (v)=="string"){ -v=new Function(v); -} -elem[k]=v; -}else{ -elem.setAttribute(k,v); -} -} -} -}else{ -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 (_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{ -_22c(elem[k],v); -} -}else{ -if(k.substring(0,2)=="on"){ -if(typeof (v)=="string"){ -v=new Function(v); -} -elem[k]=v; -}else{ -elem.setAttribute(k,v); -} -} -} -} -} -} -} -return elem; -},appendChildNodes:function(node){ -var elem=node; -var self=MochiKit.DOM; -if(typeof (node)=="string"){ -elem=self.getElement(node); -} -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{ -_234=_235(n,_234); -} -} -} -return elem; -},insertSiblingNodesBefore:function(node){ -var elem=node; -var self=MochiKit.DOM; -if(typeof (node)=="string"){ -elem=self.getElement(node); -} -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"){ -_23b.insertBefore(n,elem); -}else{ -_23a=_23c(n,_23a); -} -} -} -return _23b; -},insertSiblingNodesAfter:function(node){ -var elem=node; -var self=MochiKit.DOM; -if(typeof (node)=="string"){ -elem=self.getElement(node); -} -var _241=[self.coerceToDOM(MochiKit.Base.extend(null,arguments,1),elem)]; -if(elem.nextSibling){ -return self.insertSiblingNodesBefore(elem.nextSibling,_241); -}else{ -return self.appendChildNodes(elem.parentNode,_241); -} -},replaceChildNodes:function(node){ -var elem=node; -var self=MochiKit.DOM; -if(typeof (node)=="string"){ -elem=self.getElement(node); -arguments[0]=elem; -} -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,_247){ -var elem; -var self=MochiKit.DOM; -var m=MochiKit.Base; -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 _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 _247){ -_24d+=" type=\""+self.escapeHTML(_247.type)+"\""; -} -if(_24d){ -name="<"+name+_24d+">"; -_24c=false; -} -} -var d=self._document; -if(_24c&&d===document){ -elem=d.createElementNS("http://www.w3.org/1999/xhtml",name); -}else{ -elem=d.createElement(name); -} -}else{ -elem=name; -} -if(_247){ -self.updateNodeAttributes(elem,_247); -} -if(arguments.length<=2){ -return elem; -}else{ -var args=m.extend([elem],arguments,2); -return self.appendChildNodes.apply(this,args); -} -},createDOMFunc:function(){ -var m=MochiKit.Base; -return m.partial.apply(this,m.extend([MochiKit.DOM.createDOM],arguments)); -},removeElement:function(elem){ -var e=MochiKit.DOM.getElement(elem); -e.parentNode.removeChild(e); -return e; -},swapDOM:function(dest,src){ -var self=MochiKit.DOM; -dest=self.getElement(dest); -var _255=dest.parentNode; -if(src){ -src=self.getElement(src); -_255.replaceChild(src,dest); -}else{ -_255.removeChild(dest); -} -return src; -},getElement:function(id){ -var self=MochiKit.DOM; -if(arguments.length==1){ -return ((typeof (id)=="string")?self._document.getElementById(id):id); -}else{ -return MochiKit.Base.map(self.getElement,arguments); -} -},getElementsByTagAndClassName:function(_258,_259,_25a){ -var self=MochiKit.DOM; -if(typeof (_258)=="undefined"||_258===null){ -_258="*"; -} -if(typeof (_25a)=="undefined"||_25a===null){ -_25a=self._document; -} -_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 _25d=[]; -for(var i=0;i<_25c.length;i++){ -var _25f=_25c[i]; -var cls=_25f.className; -if(!cls){ -continue; -} -var _261=cls.split(" "); -for(var j=0;j<_261.length;j++){ -if(_261[j]==_259){ -_25d.push(_25f); -break; -} -} -} -return _25d; -},_newCallStack:function(path,once){ -var rval=function(){ -var _266=arguments.callee.callStack; -for(var i=0;i<_266.length;i++){ -if(_266[i].apply(this,arguments)===false){ -break; -} -} -if(once){ -try{ -this[path]=null; -} -catch(e){ -} -} -}; -rval.callStack=[]; -return rval; -},addToCallStack:function(_268,path,func,once){ -var self=MochiKit.DOM; -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); -} -_268[path]=_26e; -} -_26e.callStack.push(func); -},addLoadEvent:function(func){ -var self=MochiKit.DOM; -self.addToCallStack(self._window,"onload",func,true); -},focusOnLoad:function(_271){ -var self=MochiKit.DOM; -self.addLoadEvent(function(){ -_271=self.getElement(_271); -if(_271){ -_271.focus(); -} -}); -},setElementClass:function(_273,_274){ -var self=MochiKit.DOM; -var obj=self.getElement(_273); -if(self.attributeArray.compliant){ -obj.setAttribute("class",_274); -}else{ -obj.setAttribute("className",_274); -} -},toggleElementClass:function(_277){ -var self=MochiKit.DOM; -for(var i=1;i/g,">"); -},toHTML:function(dom){ -return MochiKit.DOM.emitHTML(dom).join(""); -},emitHTML:function(dom,lst){ -if(typeof (lst)=="undefined"||lst===null){ -lst=[]; -} -var _29a=[dom]; -var self=MochiKit.DOM; -var _29c=self.escapeHTML; -var _29d=self.attributeArray; -while(_29a.length){ -dom=_29a.pop(); -if(typeof (dom)=="string"){ -lst.push(dom); -}else{ -if(dom.nodeType==1){ -lst.push("<"+dom.tagName.toLowerCase()); -var _29e=[]; -var _29f=_29d(dom); -for(var i=0;i<_29f.length;i++){ -var a=_29f[i]; -_29e.push([" ",a.name,"=\"",_29c(a.value),"\""]); -} -_29e.sort(); -for(i=0;i<_29e.length;i++){ -var _2a2=_29e[i]; -for(var j=0;j<_2a2.length;j++){ -lst.push(_2a2[j]); -} -} -if(dom.hasChildNodes()){ -lst.push(">"); -_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(_29c(dom.nodeValue)); -} -} -} -} -return lst; -},scrapeText:function(node,_2a6){ -var rval=[]; -(function(node){ -var cn=node.childNodes; -if(cn){ -for(var i=0;i0){ -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; -}; -_2cc.compliant=true; -_2cc.renames={}; -} -this.attributeArray=_2cc; -var _2d5=function(_2d6,arr){ -var _2d8=arr[1].split("."); -var str=""; -var obj={}; -str+="if (!MochiKit."+_2d8[1]+") { throw new Error(\""; -str+="This function has been deprecated and depends on MochiKit."; -str+=_2d8[1]+".\");}"; -str+="return MochiKit."+_2d8[1]+"."+arr[0]; -str+=".apply(this, arguments);"; -obj[_2d8[2]]=new Function(str); -MochiKit.Base.update(MochiKit[_2d6],obj); -}; -for(var i;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}; @@ -2890,45 +1715,53 @@ 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"}}; +var _41={"position":"absolute","fontSize":this.options.axisLabelFontSize+"px","zIndex":10,"color":this.options.axisLabelColor.toRGBString(),"width":this.options.axisLabelWidth+"px","overflow":"hidden"}; +var _42=function(txt){ +var div=document.createElement("div"); +for(var _45 in _41){ +div.style[_45]=_41[_45]; +} +div.appendChild(document.createTextNode(txt)); +return div; +}; _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"; +_47.style.bottom="0px"; }else{ -_43.style.top=top+"px"; +_47.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); +_47.style.left="0px"; +_47.style.textAlign="right"; +_47.style.width=this.options.yAxisLabelWidth+"px"; +this.container.appendChild(_47); +this.ylabels.push(_47); } -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"; +var _49=this.ylabels[0]; +var _50=this.options.axisLabelFontSize; +var _51=parseInt(_49.style.top)+_50; +if(_51>this.height-_50){ +_49.style.top=(parseInt(_49.style.top)-_50/2)+"px"; } } _40.beginPath(); @@ -2940,33 +1773,33 @@ _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"; +var _47=_42(_46[1]); +_47.style.textAlign="center"; +_47.style.bottom="0px"; +var _52=(x-this.options.axisLabelWidth/2); +if(_52+this.options.axisLabelWidth>this.width){ +_52=this.width-this.options.xAxisLabelWidth; +_47.style.textAlign="right"; } -if(_48<0){ -_48=0; -_43.style.textAlign="left"; +if(_52<0){ +_52=0; +_47.style.textAlign="left"; } -_43.style.left=_48+"px"; -_43.style.width=this.options.xAxisLabelWidth+"px"; -this.container.appendChild(_43); -this.xlabels.push(_43); +_47.style.left=_52+"px"; +_47.style.width=this.options.xAxisLabelWidth+"px"; +this.container.appendChild(_47); +this.xlabels.push(_47); } } _40.beginPath(); @@ -2978,57 +1811,57 @@ _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; +var _53=this.element.getContext("2d"); +var _54=this.options.colorScheme.length; +var _55=this.options.colorScheme; +var _56=MochiKit.Base.keys(this.layout.datasets); +var _57=this.layout.options.errorBars; +var _58=_56.length; +var _59=MochiKit.Base.bind; +var _60=MochiKit.Base.partial; for(var i=0;i=0){ -ctx.moveTo(_72,_73[0]); -ctx.lineTo(_77.canvasx,_78[0]); -ctx.lineTo(_77.canvasx,_78[1]); -ctx.lineTo(_72,_73[1]); +var _82=[_81.y-_81.errorPlus*_79,_81.y+_81.errorMinus*_79]; +_82[0]=this.area.h*_82[0]+this.area.y; +_82[1]=this.area.h*_82[1]+this.area.y; +if(_76>=0){ +ctx.moveTo(_76,_77[0]); +ctx.lineTo(_81.canvasx,_82[0]); +ctx.lineTo(_81.canvasx,_82[1]); +ctx.lineTo(_76,_77[1]); ctx.closePath(); } -_73[0]=_78[0]; -_73[1]=_78[1]; -_72=_77.canvasx; +_77[0]=_82[0]; +_77[1]=_82[1]; +_76=_81.canvasx; } } ctx.fill(); } }; -if(_53){ -_55(_68,this)(_49); +if(_57){ +_59(_72,this)(_53); } -_55(_59,this)(_49); -_49.restore(); +_59(_63,this)(_53); +_53.restore(); }; -Dygraph=function(div,_80,_81){ +Dygraph=function(div,_83,_84){ if(arguments.length>0){ if(arguments.length==4){ this.warn("Using deprecated four-argument dygraph constructor"); -this.__old_init__(div,_80,arguments[2],arguments[3]); +this.__old_init__(div,_83,arguments[2],arguments[3]); }else{ -this.__init__(div,_80,_81); +this.__init__(div,_83,_84); } } }; @@ -3110,28 +1943,28 @@ Dygraph.DEBUG=1; Dygraph.INFO=2; Dygraph.WARNING=3; Dygraph.ERROR=3; -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]); +Dygraph.prototype.__old_init__=function(div,_85,_86,_87){ +if(_86!=null){ +var _88=["Date"]; +for(var i=0;i<_86.length;i++){ +_88.push(_86[i]); } -MochiKit.Base.update(_84,{"labels":_85}); +MochiKit.Base.update(_87,{"labels":_88}); } -this.__init__(div,_82,_84); +this.__init__(div,_85,_87); }; -Dygraph.prototype.__init__=function(div,_86,_87){ -if(_87==null){ -_87={}; +Dygraph.prototype.__init__=function(div,_89,_90){ +if(_90==null){ +_90={}; } this.maindiv_=div; -this.file_=_86; -this.rollPeriod_=_87.rollPeriod||Dygraph.DEFAULT_ROLL_PERIOD; +this.file_=_89; +this.rollPeriod_=_90.rollPeriod||Dygraph.DEFAULT_ROLL_PERIOD; this.previousVerticalX_=-1; -this.fractions_=_87.fractions||false; -this.dateWindow_=_87.dateWindow||null; -this.valueRange_=_87.valueRange||null; -this.wilsonInterval_=_87.wilsonInterval||true; +this.fractions_=_90.fractions||false; +this.dateWindow_=_90.dateWindow||null; +this.valueRange_=_90.valueRange||null; +this.wilsonInterval_=_90.wilsonInterval||true; div.innerHTML=""; if(div.style.width==""){ div.style.width=Dygraph.DEFAULT_WIDTH+"px"; @@ -3142,7 +1975,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_,_87); +MochiKit.Base.update(this.user_attrs_,_90); this.attrs_={}; MochiKit.Base.update(this.attrs_,Dygraph.DEFAULT_ATTRS); this.labelsFromCSV_=(this.attr_("labels")==null); @@ -3160,85 +1993,85 @@ this.createRollInterface_(); this.createDragInterface_(); this.start_(); }; -Dygraph.prototype.attr_=function(_88){ -if(typeof (this.user_attrs_[_88])!="undefined"){ -return this.user_attrs_[_88]; +Dygraph.prototype.attr_=function(_91){ +if(typeof (this.user_attrs_[_91])!="undefined"){ +return this.user_attrs_[_91]; }else{ -if(typeof (this.attrs_[_88])!="undefined"){ -return this.attrs_[_88]; +if(typeof (this.attrs_[_91])!="undefined"){ +return this.attrs_[_91]; }else{ return null; } } }; -Dygraph.prototype.log=function(_89,_90){ +Dygraph.prototype.log=function(_92,_93){ if(typeof (console)!="undefined"){ -switch(_89){ +switch(_92){ case Dygraph.DEBUG: -console.debug("dygraphs: "+_90); +console.debug("dygraphs: "+_93); break; case Dygraph.INFO: -console.info("dygraphs: "+_90); +console.info("dygraphs: "+_93); break; case Dygraph.WARNING: -console.warn("dygraphs: "+_90); +console.warn("dygraphs: "+_93); break; case Dygraph.ERROR: -console.error("dygraphs: "+_90); +console.error("dygraphs: "+_93); break; } } }; -Dygraph.prototype.info=function(_91){ -this.log(Dygraph.INFO,_91); +Dygraph.prototype.info=function(_94){ +this.log(Dygraph.INFO,_94); }; -Dygraph.prototype.warn=function(_92){ -this.log(Dygraph.WARNING,_92); +Dygraph.prototype.warn=function(_95){ +this.log(Dygraph.WARNING,_95); }; -Dygraph.prototype.error=function(_93){ -this.log(Dygraph.ERROR,_93); +Dygraph.prototype.error=function(_96){ +this.log(Dygraph.ERROR,_96); }; Dygraph.prototype.rollPeriod=function(){ return this.rollPeriod_; }; Dygraph.addEvent=function(el,evt,fn){ -var _96=function(e){ +var _99=function(e){ if(!e){ var e=window.event; } fn(e); }; if(window.addEventListener){ -el.addEventListener(evt,_96,false); +el.addEventListener(evt,_99,false); }else{ -el.attachEvent("on"+evt,_96); +el.attachEvent("on"+evt,_99); } }; Dygraph.prototype.createInterface_=function(){ -var _98=this.maindiv_; +var _101=this.maindiv_; this.graphDiv=document.createElement("div"); this.graphDiv.style.width=this.width_+"px"; this.graphDiv.style.height=this.height_+"px"; -_98.appendChild(this.graphDiv); +_101.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_); -var _99=this; +var _102=this; Dygraph.addEvent(this.hidden_,"mousemove",function(e){ -_99.mouseMove_(e); +_102.mouseMove_(e); }); Dygraph.addEvent(this.hidden_,"mouseout",function(e){ -_99.mouseOut_(e); +_102.mouseOut_(e); }); }; -Dygraph.prototype.createPlotKitCanvas_=function(_100){ +Dygraph.prototype.createPlotKitCanvas_=function(_103){ var h=document.createElement("canvas"); h.style.position="absolute"; -h.style.top=_100.style.top; -h.style.left=_100.style.left; +h.style.top=_103.style.top; +h.style.left=_103.style.left; h.width=this.width_; h.height=this.height_; this.graphDiv.appendChild(h); @@ -3247,8 +2080,8 @@ return h; Dygraph.prototype.setColors_=function(){ var num=this.attr_("labels").length-1; this.colors_=[]; -var _103=this.attr_("colors"); -if(!_103){ +var _106=this.attr_("colors"); +if(!_106){ var sat=this.attr_("colorSaturation")||1; var val=this.attr_("colorValue")||0.5; for(var i=1;i<=num;i++){ @@ -3257,8 +2090,8 @@ this.colors_.push(MochiKit.Color.Color.fromHSV(hue,sat,val)); } }else{ for(var i=0;i=10){ -self.doZoom_(Math.min(_123,_125),Math.max(_123,_125)); +Dygraph.addEvent(this.hidden_,"mouseup",function(_139){ +if(_125){ +_125=false; +_128=getX(_139); +_129=getY(_139); +var _140=Math.abs(_128-_126); +var _141=Math.abs(_129-_127); +if(_140<2&&_141<2&&self.attr_("clickCallback")!=null&&self.lastx_!=undefined){ +self.attr_("clickCallback")(_139,new Date(self.lastx_)); +} +if(_140>=10){ +self.doZoom_(Math.min(_126,_128),Math.max(_126,_128)); }else{ self.canvas_.getContext("2d").clearRect(0,0,self.canvas_.width,self.canvas_.height); } -_123=null; -_124=null; +_126=null; +_127=null; } }); -Dygraph.addEvent(this.hidden_,"dblclick",function(_139){ +Dygraph.addEvent(this.hidden_,"dblclick",function(_142){ self.dateWindow_=null; self.drawGraph_(self.rawData_); -var _140=self.rawData_[0][0]; -var _141=self.rawData_[self.rawData_.length-1][0]; +var _143=self.rawData_[0][0]; +var _144=self.rawData_[self.rawData_.length-1][0]; if(self.attr_("zoomCallback")){ -self.attr_("zoomCallback")(_140,_141); +self.attr_("zoomCallback")(_143,_144); } }); }; -Dygraph.prototype.drawZoomRect_=function(_142,endX,_144){ +Dygraph.prototype.drawZoomRect_=function(_145,endX,_147){ var ctx=this.canvas_.getContext("2d"); -if(_144){ -ctx.clearRect(Math.min(_142,_144),0,Math.abs(_142-_144),this.height_); +if(_147){ +ctx.clearRect(Math.min(_145,_147),0,Math.abs(_145-_147),this.height_); } -if(endX&&_142){ +if(endX&&_145){ ctx.fillStyle="rgba(128,128,128,0.33)"; -ctx.fillRect(Math.min(_142,endX),0,Math.abs(endX-_142),this.height_); +ctx.fillRect(Math.min(_145,endX),0,Math.abs(endX-_145),this.height_); } }; -Dygraph.prototype.doZoom_=function(lowX,_146){ -var _147=this.layout_.points; -var _148=null; -var _149=null; -for(var i=0;i<_147.length;i++){ -var cx=_147[i].canvasx; -var x=_147[i].xval; -if(cx_148)){ -_148=x; +Dygraph.prototype.doZoom_=function(lowX,_149){ +var _150=this.layout_.points; +var _151=null; +var _152=null; +for(var i=0;i<_150.length;i++){ +var cx=_150[i].canvasx; +var x=_150[i].xval; +if(cx_151)){ +_151=x; } -if(cx>_146&&(_149==null||x<_149)){ -_149=x; +if(cx>_149&&(_152==null||x<_152)){ +_152=x; } } -if(_148==null){ -_148=_147[0].xval; +if(_151==null){ +_151=_150[0].xval; } -if(_149==null){ -_149=_147[_147.length-1].xval; +if(_152==null){ +_152=_150[_150.length-1].xval; } -this.dateWindow_=[_148,_149]; +this.dateWindow_=[_151,_152]; this.drawGraph_(this.rawData_); if(this.attr_("zoomCallback")){ -this.attr_("zoomCallback")(_148,_149); +this.attr_("zoomCallback")(_151,_152); } }; -Dygraph.prototype.mouseMove_=function(_151){ -var _152=Dygraph.pageX(_151)-Dygraph.findPosX(this.hidden_); -var _153=this.layout_.points; -var _154=-1; -var _155=-1; -var _156=1e+100; +Dygraph.prototype.mouseMove_=function(_154){ +var _155=Dygraph.pageX(_154)-Dygraph.findPosX(this.hidden_); +var _156=this.layout_.points; +var _157=-1; +var _158=-1; +var _159=1e+100; var idx=-1; -for(var i=0;i<_153.length;i++){ -var dist=Math.abs(_153[i].canvasx-_152); -if(dist>_156){ +for(var i=0;i<_156.length;i++){ +var dist=Math.abs(_156[i].canvasx-_155); +if(dist>_159){ break; } -_156=dist; +_159=dist; idx=i; } if(idx>=0){ -_154=_153[idx].xval; +_157=_156[idx].xval; } -if(_152>_153[_153.length-1].canvasx){ -_154=_153[_153.length-1].xval; +if(_155>_156[_156.length-1].canvasx){ +_157=_156[_156.length-1].xval; } -var _159=[]; -for(var i=0;i<_153.length;i++){ -if(_153[i].xval==_154){ -_159.push(_153[i]); +var _162=[]; +for(var i=0;i<_156.length;i++){ +if(_156[i].xval==_157){ +_162.push(_156[i]); } } -var _160=this.attr_("highlightCircleSize"); +var _163=this.attr_("highlightCircleSize"); var ctx=this.canvas_.getContext("2d"); if(this.previousVerticalX_>=0){ var px=this.previousVerticalX_; -ctx.clearRect(px-_160-1,0,2*_160+2,this.height_); +ctx.clearRect(px-_163-1,0,2*_163+2,this.height_); } var isOK=function(x){ return x&&!isNaN(x); }; -if(_159.length>0){ -var _152=_159[0].canvasx; -var _162=this.attr_("xValueFormatter")(_154,this)+":"; +if(_162.length>0){ +var _155=_162[0].canvasx; +var _165=this.attr_("xValueFormatter")(_157,this)+":"; var clen=this.colors_.length; -for(var i=0;i<_159.length;i++){ -if(!isOK(_159[i].canvasy)){ +for(var i=0;i<_162.length;i++){ +if(!isOK(_162[i].canvasy)){ continue; } if(this.attr_("labelsSeparateLines")){ -_162+="
"; +_165+="
"; } -var _164=_159[i]; -_162+=" "+_164.name+":"+this.round_(_164.yval,2); +var _167=_162[i]; +_165+=" "+_167.name+":"+this.round_(_167.yval,2); } -this.attr_("labelsDiv").innerHTML=_162; -this.lastx_=_154; +this.attr_("labelsDiv").innerHTML=_165; +this.lastx_=_157; ctx.save(); -for(var i=0;i<_159.length;i++){ -if(!isOK(_159[i%clen].canvasy)){ +for(var i=0;i<_162.length;i++){ +if(!isOK(_162[i%clen].canvasy)){ continue; } ctx.beginPath(); ctx.fillStyle=this.colors_[i%clen].toRGBString(); -ctx.arc(_152,_159[i%clen].canvasy,_160,0,360,false); +ctx.arc(_155,_162[i%clen].canvasy,_163,0,360,false); ctx.fill(); } ctx.restore(); -this.previousVerticalX_=_152; +this.previousVerticalX_=_155; } }; -Dygraph.prototype.mouseOut_=function(_165){ +Dygraph.prototype.mouseOut_=function(_168){ var ctx=this.canvas_.getContext("2d"); ctx.clearRect(0,0,this.width_,this.height_); this.attr_("labelsDiv").innerHTML=""; @@ -3531,34 +2364,34 @@ return ""+x; } }; Dygraph.prototype.hmsString_=function(date){ -var _167=Dygraph.zeropad; +var _170=Dygraph.zeropad; var d=new Date(date); if(d.getSeconds()){ -return _167(d.getHours())+":"+_167(d.getMinutes())+":"+_167(d.getSeconds()); +return _170(d.getHours())+":"+_170(d.getMinutes())+":"+_170(d.getSeconds()); }else{ if(d.getMinutes()){ -return _167(d.getHours())+":"+_167(d.getMinutes()); +return _170(d.getHours())+":"+_170(d.getMinutes()); }else{ -return _167(d.getHours()); +return _170(d.getHours()); } } }; Dygraph.dateString_=function(date,self){ -var _169=Dygraph.zeropad; +var _172=Dygraph.zeropad; var d=new Date(date); var year=""+d.getFullYear(); -var _171=_169(d.getMonth()+1); -var day=_169(d.getDate()); +var _174=_172(d.getMonth()+1); +var day=_172(d.getDate()); var ret=""; var frac=d.getHours()*3600+d.getMinutes()*60+d.getSeconds(); if(frac){ ret=" "+self.hmsString_(date); } -return year+"/"+_171+"/"+day+ret; +return year+"/"+_174+"/"+day+ret; }; -Dygraph.prototype.round_=function(num,_175){ -var _176=Math.pow(10,_175); -return Math.round(num*_176)/_176; +Dygraph.prototype.round_=function(num,_178){ +var _179=Math.pow(10,_178); +return Math.round(num*_179)/_179; }; Dygraph.prototype.loadedEvent_=function(data){ this.rawData_=this.parseCSV_(data); @@ -3567,16 +2400,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 _178,endDate; +var _181,endDate; if(this.dateWindow_){ -_178=this.dateWindow_[0]; +_181=this.dateWindow_[0]; endDate=this.dateWindow_[1]; }else{ -_178=this.rawData_[0][0]; +_181=this.rawData_[0][0]; endDate=this.rawData_[this.rawData_.length-1][0]; } -var _179=this.attr_("xTicker")(_178,endDate,this); -this.layout_.updateOptions({xTicks:_179}); +var _182=this.attr_("xTicker")(_181,endDate,this); +this.layout_.updateOptions({xTicks:_182}); }; Dygraph.SECONDLY=0; Dygraph.TEN_SECONDLY=1; @@ -3605,161 +2438,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(_180,_181,_182){ -if(_182=Dygraph.DAILY){ -_191.push({v:t,label:new Date(t+3600*1000).strftime(_193)}); +if(frac==0||_193>=Dygraph.DAILY){ +_194.push({v:t,label:new Date(t+3600*1000).strftime(_196)}); }else{ -_191.push({v:t,label:this.hmsString_(t)}); +_194.push({v:t,label:this.hmsString_(t)}); } } }else{ -var _195; -var _196=1; -if(_190==Dygraph.MONTHLY){ -_195=[0,1,2,3,4,5,6,7,8,9,10,11,12]; +var _198; +var _199=1; +if(_193==Dygraph.MONTHLY){ +_198=[0,1,2,3,4,5,6,7,8,9,10,11,12]; }else{ -if(_190==Dygraph.QUARTERLY){ -_195=[0,3,6,9]; +if(_193==Dygraph.QUARTERLY){ +_198=[0,3,6,9]; }else{ -if(_190==Dygraph.BIANNUAL){ -_195=[0,6]; +if(_193==Dygraph.BIANNUAL){ +_198=[0,6]; }else{ -if(_190==Dygraph.ANNUAL){ -_195=[0]; +if(_193==Dygraph.ANNUAL){ +_198=[0]; }else{ -if(_190==Dygraph.DECADAL){ -_195=[0]; -_196=10; +if(_193==Dygraph.DECADAL){ +_198=[0]; +_199=10; } } } } } -var _197=new Date(_188).getFullYear(); -var _198=new Date(_189).getFullYear(); -var _199=Dygraph.zeropad; -for(var i=_197;i<=_198;i++){ -if(i%_196!=0){ +var _200=new Date(_191).getFullYear(); +var _201=new Date(_192).getFullYear(); +var _202=Dygraph.zeropad; +for(var i=_200;i<=_201;i++){ +if(i%_199!=0){ continue; } -for(var j=0;j<_195.length;j++){ -var _200=i+"/"+_199(1+_195[j])+"/01"; -var t=Date.parse(_200); -if(t<_188||t>_189){ +for(var j=0;j<_198.length;j++){ +var _203=i+"/"+_202(1+_198[j])+"/01"; +var t=Date.parse(_203); +if(t<_191||t>_192){ continue; } -_191.push({v:t,label:new Date(t).strftime("%b %y")}); +_194.push({v:t,label:new Date(t).strftime("%b %y")}); } } } -return _191; +return _194; }; -Dygraph.dateTicker=function(_201,_202,self){ -var _203=-1; +Dygraph.dateTicker=function(_204,_205,self){ +var _206=-1; for(var i=0;i=self.attr_("pixelsPerXLabel")){ -_203=i; +var _207=self.NumXTicks(_204,_205,i); +if(self.width_/_207>=self.attr_("pixelsPerXLabel")){ +_206=i; break; } } -if(_203>=0){ -return self.GetXAxis(_201,_202,_203); +if(_206>=0){ +return self.GetXAxis(_204,_205,_206); }else{ } }; Dygraph.numericTicks=function(minV,maxV,self){ -var _207=[1,2,5]; -var _208,low_val,high_val,nTicks; -var _209=self.attr_("pixelsPerYLabel"); +var _210=[1,2,5]; +var _211,low_val,high_val,nTicks; +var _212=self.attr_("pixelsPerYLabel"); for(var i=-10;i<50;i++){ -var _210=Math.pow(10,i); -for(var j=0;j<_207.length;j++){ -_208=_210*_207[j]; -low_val=Math.floor(minV/_208)*_208; -high_val=Math.ceil(maxV/_208)*_208; -nTicks=(high_val-low_val)/_208; -var _211=self.height_/nTicks; -if(_211>_209){ +var _213=Math.pow(10,i); +for(var j=0;j<_210.length;j++){ +_211=_213*_210[j]; +low_val=Math.floor(minV/_211)*_211; +high_val=Math.ceil(maxV/_211)*_211; +nTicks=(high_val-low_val)/_211; +var _214=self.height_/nTicks; +if(_214>_212){ break; } } -if(_211>_209){ +if(_214>_212){ break; } } -var _212=[]; +var _215=[]; for(var i=0;i=k*k*k){ -_214=self.round_(_213/(k*k*k),1)+"B"; +if(_216>=k*k*k){ +_217=self.round_(_216/(k*k*k),1)+"B"; }else{ -if(_213>=k*k){ -_214=self.round_(_213/(k*k),1)+"M"; +if(_216>=k*k){ +_217=self.round_(_216/(k*k),1)+"M"; }else{ -if(_213>=k){ -_214=self.round_(_213/k,1)+"K"; +if(_216>=k){ +_217=self.round_(_216/k,1)+"K"; } } } } -_212.push({label:_214,v:_213}); +_215.push({label:_217,v:_216}); } -return _212; +return _215; }; Dygraph.prototype.addYTicks_=function(minY,maxY){ -var _218=Dygraph.numericTicks(minY,maxY,this); -this.layout_.updateOptions({yAxis:[minY,maxY],yTicks:_218}); +var _221=Dygraph.numericTicks(minY,maxY,this); +this.layout_.updateOptions({yAxis:[minY,maxY],yTicks:_221}); }; -Dygraph.prototype.extremeValues_=function(_219){ +Dygraph.prototype.extremeValues_=function(_222){ var minY=null,maxY=null; var bars=this.attr_("errorBars")||this.attr_("customBars"); if(bars){ -for(var j=0;j<_219.length;j++){ -var y=_219[j][1][0]; +for(var j=0;j<_222.length;j++){ +var y=_222[j][1][0]; if(!y){ continue; } -var low=y-_219[j][1][1]; -var high=y+_219[j][1][2]; +var low=y-_222[j][1][1]; +var high=y+_222[j][1][2]; if(low>y){ low=y; } @@ -3774,8 +2607,8 @@ minY=low; } } }else{ -for(var j=0;j<_219.length;j++){ -var y=_219[j][1]; +for(var j=0;j<_222.length;j++){ +var y=_222[j][1]; if(!y){ continue; } @@ -3795,64 +2628,64 @@ this.layout_.removeAllDatasets(); this.setColors_(); this.attrs_["pointSize"]=0.5*this.attr_("highlightCircleSize"); for(var i=1;i=low&&_223[k][0]<=high){ -_224.push(_223[k]); +var _227=[]; +for(var k=0;k<_226.length;k++){ +if(_226[k][0]>=low&&_226[k][0]<=high){ +_227.push(_226[k]); } } -_223=_224; +_226=_227; } -var _225=this.extremeValues_(_223); -var _226=_225[0]; -var _227=_225[1]; -if(!minY||_226maxY){ -maxY=_227; +if(!maxY||_230>maxY){ +maxY=_230; } if(bars){ var vals=[]; -for(var j=0;j<_223.length;j++){ -vals[j]=[_223[j][0],_223[j][1][0],_223[j][1][1],_223[j][1][2]]; +for(var j=0;j<_226.length;j++){ +vals[j]=[_226[j][0],_226[j][1][0],_226[j][1][1],_226[j][1][2]]; } this.layout_.addDataset(this.attr_("labels")[i],vals); }else{ -this.layout_.addDataset(this.attr_("labels")[i],_223); +this.layout_.addDataset(this.attr_("labels")[i],_226); } } if(this.valueRange_!=null){ this.addYTicks_(this.valueRange_[0],this.valueRange_[1]); }else{ var span=maxY-minY; -var _230=maxY+0.1*span; -var _231=minY-0.1*span; -if(_231<0&&minY>=0){ -_231=0; +var _233=maxY+0.1*span; +var _234=minY-0.1*span; +if(_234<0&&minY>=0){ +_234=0; } -if(_230>0&&maxY<=0){ -_230=0; +if(_233>0&&maxY<=0){ +_233=0; } if(this.attr_("includeZero")){ if(maxY<0){ -_230=0; +_233=0; } if(minY>0){ -_231=0; +_234=0; } } -this.addYTicks_(_231,_230); +this.addYTicks_(_234,_233); } this.addXTicks_(); this.layout_.evaluateWithError(); @@ -3860,44 +2693,44 @@ this.plotter_.clear(); this.plotter_.render(); this.canvas_.getContext("2d").clearRect(0,0,this.canvas_.width,this.canvas_.height); }; -Dygraph.prototype.rollingAverage=function(_232,_233){ -if(_232.length<2){ -return _232; +Dygraph.prototype.rollingAverage=function(_235,_236){ +if(_235.length<2){ +return _235; } -var _233=Math.min(_233,_232.length-1); -var _234=[]; -var _235=this.attr_("sigma"); +var _236=Math.min(_236,_235.length-1); +var _237=[]; +var _238=this.attr_("sigma"); if(this.fractions_){ var num=0; var den=0; var mult=100; -for(var i=0;i<_232.length;i++){ -num+=_232[i][1][0]; -den+=_232[i][1][1]; -if(i-_233>=0){ -num-=_232[i-_233][1][0]; -den-=_232[i-_233][1][1]; -} -var date=_232[i][0]; -var _238=den?num/den:0; +for(var i=0;i<_235.length;i++){ +num+=_235[i][1][0]; +den+=_235[i][1][1]; +if(i-_236>=0){ +num-=_235[i-_236][1][0]; +den-=_235[i-_236][1][1]; +} +var date=_235[i][0]; +var _241=den?num/den:0; if(this.attr_("errorBars")){ if(this.wilsonInterval_){ if(den){ -var p=_238<0?0:_238,n=den; -var pm=_235*Math.sqrt(p*(1-p)/n+_235*_235/(4*n*n)); -var _241=1+_235*_235/den; -var low=(p+_235*_235/(2*den)-pm)/_241; -var high=(p+_235*_235/(2*den)+pm)/_241; -_234[i]=[date,[p*mult,(p-low)*mult,(high-p)*mult]]; +var p=_241<0?0:_241,n=den; +var pm=_238*Math.sqrt(p*(1-p)/n+_238*_238/(4*n*n)); +var _244=1+_238*_238/den; +var low=(p+_238*_238/(2*den)-pm)/_244; +var high=(p+_238*_238/(2*den)+pm)/_244; +_237[i]=[date,[p*mult,(p-low)*mult,(high-p)*mult]]; }else{ -_234[i]=[date,[0,0,0]]; +_237[i]=[date,[0,0,0]]; } }else{ -var _242=den?_235*Math.sqrt(_238*(1-_238)/den):1; -_234[i]=[date,[mult*_238,mult*_242,mult*_242]]; +var _245=den?_238*Math.sqrt(_241*(1-_241)/den):1; +_237[i]=[date,[mult*_241,mult*_245,mult*_245]]; } }else{ -_234[i]=[date,mult*_238]; +_237[i]=[date,mult*_241]; } } }else{ @@ -3905,105 +2738,105 @@ if(this.attr_("customBars")){ var low=0; var mid=0; var high=0; -var _244=0; -for(var i=0;i<_232.length;i++){ -var data=_232[i][1]; +var _247=0; +for(var i=0;i<_235.length;i++){ +var data=_235[i][1]; var y=data[1]; -_234[i]=[_232[i][0],[y,y-data[0],data[2]-y]]; +_237[i]=[_235[i][0],[y,y-data[0],data[2]-y]]; low+=data[0]; mid+=y; high+=data[2]; -_244+=1; -if(i-_233>=0){ -var prev=_232[i-_233]; +_247+=1; +if(i-_236>=0){ +var prev=_235[i-_236]; low-=prev[1][0]; mid-=prev[1][1]; high-=prev[1][2]; -_244-=1; +_247-=1; } -_234[i]=[_232[i][0],[1*mid/_244,1*(mid-low)/_244,1*(high-mid)/_244]]; +_237[i]=[_235[i][0],[1*mid/_247,1*(mid-low)/_247,1*(high-mid)/_247]]; } }else{ -var _246=Math.min(_233-1,_232.length-2); +var _249=Math.min(_236-1,_235.length-2); if(!this.attr_("errorBars")){ -if(_233==1){ -return _232; +if(_236==1){ +return _235; } -for(var i=0;i<_232.length;i++){ +for(var i=0;i<_235.length;i++){ var sum=0; -var _248=0; -for(var j=Math.max(0,i-_233+1);j=0||str.indexOf("/")>=0||isNaN(parseFloat(str))){ -_253=true; +_256=true; }else{ if(str.length==8&&str>"19700101"&&str<"20371231"){ -_253=true; +_256=true; } } -if(_253){ +if(_256){ this.attrs_.xValueFormatter=Dygraph.dateString_; this.attrs_.xValueParser=Dygraph.dateParser; this.attrs_.xTicker=Dygraph.dateTicker; @@ -4019,57 +2852,57 @@ this.attrs_.xTicker=Dygraph.numericTicks; }; Dygraph.prototype.parseCSV_=function(data){ var ret=[]; -var _254=data.split("\n"); -var _255=0; +var _257=data.split("\n"); +var _258=0; if(this.labelsFromCSV_){ -_255=1; -this.attrs_.labels=_254[0].split(","); -} -var _256; -var _257=false; -var _258=this.attr_("labels").length; -for(var i=_255;i<_254.length;i++){ -var line=_254[i]; +_258=1; +this.attrs_.labels=_257[0].split(","); +} +var _259; +var _260=false; +var _261=this.attr_("labels").length; +for(var i=_258;i<_257.length;i++){ +var line=_257[i]; if(line.length==0){ continue; } -var _260=line.split(","); -if(_260.length<2){ +var _263=line.split(","); +if(_263.length<2){ continue; } -var _261=[]; -if(!_257){ -this.detectTypeFromString_(_260[0]); -_256=this.attr_("xValueParser"); -_257=true; +var _264=[]; +if(!_260){ +this.detectTypeFromString_(_263[0]); +_259=this.attr_("xValueParser"); +_260=true; } -_261[0]=_256(_260[0],this); +_264[0]=_259(_263[0],this); if(this.fractions_){ -for(var j=1;j<_260.length;j++){ -var vals=_260[j].split("/"); -_261[j]=[parseFloat(vals[0]),parseFloat(vals[1])]; +for(var j=1;j<_263.length;j++){ +var vals=_263[j].split("/"); +_264[j]=[parseFloat(vals[0]),parseFloat(vals[1])]; } }else{ if(this.attr_("errorBars")){ -for(var j=1;j<_260.length;j+=2){ -_261[(j+1)/2]=[parseFloat(_260[j]),parseFloat(_260[j+1])]; +for(var j=1;j<_263.length;j+=2){ +_264[(j+1)/2]=[parseFloat(_263[j]),parseFloat(_263[j+1])]; } }else{ if(this.attr_("customBars")){ -for(var j=1;j<_260.length;j++){ -var vals=_260[j].split(";"); -_261[j]=[parseFloat(vals[0]),parseFloat(vals[1]),parseFloat(vals[2])]; +for(var j=1;j<_263.length;j++){ +var vals=_263[j].split(";"); +_264[j]=[parseFloat(vals[0]),parseFloat(vals[1]),parseFloat(vals[2])]; } }else{ -for(var j=1;j<_260.length;j++){ -_261[j]=parseFloat(_260[j]); +for(var j=1;j<_263.length;j++){ +_264[j]=parseFloat(_263[j]); } } } } -ret.push(_261); -if(_261.length!=_258){ -this.error("Number of columns in line "+i+" ("+_261.length+") does not agree with number of labels ("+_258+") "+line); +ret.push(_264); +if(_264.length!=_261){ +this.error("Number of columns in line "+i+" ("+_264.length+") does not agree with number of labels ("+_261+") "+line); } } return ret; @@ -4093,19 +2926,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 _262=MochiKit.Base.clone(data); +var _265=MochiKit.Base.clone(data); for(var i=0;i=0){ this.loadedEvent_(this.file_); }else{ var req=new XMLHttpRequest(); -var _269=this; +var _272=this; req.onreadystatechange=function(){ if(req.readyState==4){ if(req.status==200){ -_269.loadedEvent_(req.responseText); +_272.loadedEvent_(req.responseText); } } }; @@ -4194,36 +3027,36 @@ this.error("Unknown data format: "+(typeof this.file_)); } } }; -Dygraph.prototype.updateOptions=function(_270){ -if(_270.rollPeriod){ -this.rollPeriod_=_270.rollPeriod; +Dygraph.prototype.updateOptions=function(_273){ +if(_273.rollPeriod){ +this.rollPeriod_=_273.rollPeriod; } -if(_270.dateWindow){ -this.dateWindow_=_270.dateWindow; +if(_273.dateWindow){ +this.dateWindow_=_273.dateWindow; } -if(_270.valueRange){ -this.valueRange_=_270.valueRange; +if(_273.valueRange){ +this.valueRange_=_273.valueRange; } -MochiKit.Base.update(this.user_attrs_,_270); +MochiKit.Base.update(this.user_attrs_,_273); this.labelsFromCSV_=(this.attr_("labels")==null); this.layout_.updateOptions({"errorBars":this.attr_("errorBars")}); -if(_270["file"]&&_270["file"]!=this.file_){ -this.file_=_270["file"]; +if(_273["file"]&&_273["file"]!=this.file_){ +this.file_=_273["file"]; this.start_(); }else{ this.drawGraph_(this.rawData_); } }; -Dygraph.prototype.adjustRoll=function(_271){ -this.rollPeriod_=_271; +Dygraph.prototype.adjustRoll=function(_274){ +this.rollPeriod_=_274; this.drawGraph_(this.rawData_); }; -Dygraph.GVizChart=function(_272){ -this.container=_272; +Dygraph.GVizChart=function(_275){ +this.container=_275; }; -Dygraph.GVizChart.prototype.draw=function(data,_273){ +Dygraph.GVizChart.prototype.draw=function(data,_276){ this.container.innerHTML=""; -this.date_graph=new Dygraph(this.container,data,_273); +this.date_graph=new Dygraph(this.container,data,_276); }; DateGraph=Dygraph; -- 2.7.4