diff --git a/Makefile b/Makefile index 157e24fcf6396..a0f840c457d77 100644 --- a/Makefile +++ b/Makefile @@ -2,9 +2,7 @@ JS_COMPILER = \ java -jar lib/google-compiler/compiler.jar \ --externs=src/externs.js \ --warning_level=VERBOSE \ - --compilation_level=ADVANCED_OPTIMIZATIONS \ - --charset=UTF-8 \ - --output_wrapper='(function(){%output%})()' + --charset=UTF-8 all: \ d3.js \ @@ -21,9 +19,11 @@ all: \ d3.time.min.js .INTERMEDIATE d3.js: \ + src/start.js \ d3.core.js \ d3.scale.js \ - d3.svg.js + d3.svg.js \ + src/end.js d3.core.js: \ src/core/core.js \ @@ -76,32 +76,42 @@ d3.svg.js: \ src/svg/mouse.js d3.layout.js: \ + src/start.js \ src/layout/layout.js \ - src/layout/chord.js + src/layout/chord.js \ + src/end.js d3.geo.js: \ + src/start.js \ src/geo/geo.js \ src/geo/albers.js \ src/geo/mercator.js \ - src/geo/path.js + src/geo/path.js \ + src/end.js d3.csv.js: \ + src/start.js \ src/csv/csv.js \ src/csv/parse.js \ - src/csv/format.js + src/csv/format.js \ + src/end.js d3.time.js: \ + src/start.js \ src/time/time.js \ - src/time/format.js + src/time/format.js \ + src/end.js d3.geom.js: \ + src/start.js \ src/geom/geom.js \ src/geom/hull.js \ src/geom/polygon.js \ src/geom/voronoi.js \ - src/geom/delaunay.js + src/geom/delaunay.js \ + src/end.js -%.min.js: %.js Makefile src/externs.js +%.min.js: %.js Makefile @rm -f $@ $(JS_COMPILER) --js $< --js_output_file $@ diff --git a/d3.csv.js b/d3.csv.js index f8ebce109733a..7b4015d20567c 100644 --- a/d3.csv.js +++ b/d3.csv.js @@ -1,4 +1,4 @@ -d3.csv = function(url, callback) { +(function(){d3.csv = function(url, callback) { d3.text(url, "text/csv", function(text) { callback(text && d3.csv.parse(text)); }); @@ -81,3 +81,4 @@ function d3_csv_formatValue(text) { ? "\"" + text.replace(/\"/g, "\"\"") + "\"" : text; } +})() \ No newline at end of file diff --git a/d3.csv.min.js b/d3.csv.min.js index ab99137897c9d..1f027a74b2270 100644 --- a/d3.csv.min.js +++ b/d3.csv.min.js @@ -1,3 +1,2 @@ -(function(){d3.csv=function(a,c){d3.text(a,"text/csv",function(d){c(d&&d3.csv.parse(d))})};d3.csv.parse=function(a){var c;return d3.csv.parseRows(a,function(d,j){if(j){for(var f={},g=-1,e=c.length;++g50?h:d)(j)}};var q=Math.PI/180; -d3.geo.mercator=function(){function d(i){return[h*(i[0]/360)+g[0],h*Math.max(-0.5,Math.min(0.5,-180/Math.PI*Math.log(Math.tan(Math.PI/4+i[1]*Math.PI/360))/360))+g[1]]}var h=500,g=[480,250];d.scale=function(i){if(!arguments.length)return h;h=+i;return d};d.translate=function(i){if(!arguments.length)return g;g=[+i[0],+i[1]];return d};return d}; -d3.geo.path=function(){function d(a){if(typeof j=="function")k=t(j.apply(this,arguments));return g(n,a)}function h(a){return o(a).join(",")}function g(a,b){return b&&b.type in a?a[b.type](b):""}function i(a){for(var b=Math.abs(d3.geom.polygon(a[0].map(o)).area()),c=0,f=a.length;++c50?h:d)(j)}};var q=Math.PI/180;d3.geo.mercator=function(){function d(i){return[h*(i[0]/360)+g[0],h*Math.max(-0.5,Math.min(0.5,-180/Math.PI*Math.log(Math.tan(Math.PI/4+i[1]*Math.PI/360))/360))+g[1]]}var h=500,g=[480,250];d.scale=function(i){if(!arguments.length)return h;h=+i;return d};d.translate=function(i){if(!arguments.length)return g;g=[+i[0], ++i[1]];return d};return d};d3.geo.path=function(){function d(a){if(typeof j=="function")k=u(j.apply(this,arguments));return g(n,a)}function h(a){return o(a).join(",")}function g(a,b){return b&&b.type in a?a[b.type](b):""}function i(a){for(var b=Math.abs(d3.geom.polygon(a[0].map(o)).area()),c=0,f=a.length;++c= 0) { - s1 = e.ep["r"]; - s2 = e.ep["l"]; + s1 = e.ep.r; + s2 = e.ep.l; } else { - s1 = e.ep["l"]; - s2 = e.ep["r"]; + s1 = e.ep.l; + s2 = e.ep.r; } if (e.a == 1) { y1 = s1 ? s1.y : -1e6; @@ -205,8 +205,8 @@ d3.geom.voronoi = function(vertices) { } var v1 = [x1, y1], v2 = [x2, y2]; - polygons[e.region["l"].index].push(v1, v2); - polygons[e.region["r"].index].push(v1, v2); + polygons[e.region.l.index].push(v1, v2); + polygons[e.region.r.index].push(v1, v2); }); // Reconnect the polygon segments into counterclockwise loops. @@ -255,8 +255,8 @@ function d3_voronoi_tessellate(vertices, callback) { init: function() { EdgeList.leftEnd = EdgeList.createHalfEdge(null, "l"); EdgeList.rightEnd = EdgeList.createHalfEdge(null, "l"); - EdgeList.leftEnd["r"] = EdgeList.rightEnd; - EdgeList.rightEnd["l"] = EdgeList.leftEnd; + EdgeList.leftEnd.r = EdgeList.rightEnd; + EdgeList.rightEnd.l = EdgeList.leftEnd; EdgeList.list.unshift(EdgeList.leftEnd, EdgeList.rightEnd); }, @@ -271,33 +271,33 @@ function d3_voronoi_tessellate(vertices, callback) { }, insert: function(lb, he) { - he["l"] = lb; - he["r"] = lb["r"]; - lb["r"]["l"] = he; - lb["r"] = he; + he.l = lb; + he.r = lb.r; + lb.r.l = he; + lb.r = he; }, leftBound: function(p) { var he = EdgeList.leftEnd; do { - he = he["r"]; + he = he.r; } while (he != EdgeList.rightEnd && Geom.rightOf(he, p)); - he = he["l"]; + he = he.l; return he; }, del: function(he) { - he["l"]["r"] = he["r"]; - he["r"]["l"] = he["l"]; + he.l.r = he.r; + he.r.l = he.l; he.edge = null; }, right: function(he) { - return he["r"]; + return he.r; }, left: function(he) { - return he["l"]; + return he.l; }, leftRegion: function(he) { @@ -345,7 +345,7 @@ function d3_voronoi_tessellate(vertices, callback) { intersect: function(el1, el2) { var e1 = el1.edge, e2 = el2.edge; - if (!e1 || !e2 || (e1.region["r"] == e2.region["r"])) { + if (!e1 || !e2 || (e1.region.r == e2.region.r)) { return null; } var d = (e1.a * e2.b) - (e1.b * e2.a); @@ -354,8 +354,8 @@ function d3_voronoi_tessellate(vertices, callback) { } var xint = (e1.c * e2.b - e2.c * e1.b) / d, yint = (e2.c * e1.a - e1.c * e2.a) / d, - e1r = e1.region["r"], - e2r = e2.region["r"], + e1r = e1.region.r, + e2r = e2.region.r, el, e; if ((e1r.y < e2r.y) || @@ -366,7 +366,7 @@ function d3_voronoi_tessellate(vertices, callback) { el = el2; e = e2; } - var rightOfSite = (xint >= e.region["r"].x); + var rightOfSite = (xint >= e.region.r.x); if ((rightOfSite && (el.side == "l")) || (!rightOfSite && (el.side == "r"))) { return null; @@ -379,7 +379,7 @@ function d3_voronoi_tessellate(vertices, callback) { rightOf: function(he, p) { var e = he.edge, - topsite = e.region["r"], + topsite = e.region.r, rightOfSite = (p.x > topsite.x); if (rightOfSite && (he.side == "l")) { @@ -407,7 +407,7 @@ function d3_voronoi_tessellate(vertices, callback) { } } if (!fast) { - var dxs = topsite.x - e.region["l"].x; + var dxs = topsite.x - e.region.l.x; above = (e.b * (dxp * dxp - dyp * dyp)) < (dxs * dyp * (1 + 2 * dxp / dxs + e.b * e.b)); @@ -574,7 +574,7 @@ d3.geom.delaunay = function(vertices) { // Use the Voronoi tessellation to determine Delaunay edges. d3_voronoi_tessellate(vertices, function(e) { - edges[e.region["l"].index].push(vertices[e.region["r"].index]); + edges[e.region.l.index].push(vertices[e.region.r.index]); }); // Reconnect the edges into counterclockwise triangles. @@ -595,3 +595,4 @@ d3.geom.delaunay = function(vertices) { return triangles; }; +})() \ No newline at end of file diff --git a/d3.geom.min.js b/d3.geom.min.js index f5d1f930cc743..c0339098f4a77 100644 --- a/d3.geom.min.js +++ b/d3.geom.min.js @@ -1,14 +1,12 @@ -(function(){var s=null;d3.geom={}; -d3.geom.hull=function(c){if(c.length<3)return[];var h=c.length,f=h-1,a=[],i=[],b,j=0,m,k,o,p,x,n,v;for(b=1;b=o*o+p*p)a[b].index=-1;else{a[x].index= --1;v=a[b].a;x=b;n=h}}else{v=a[b].a;x=b;n=h}}i.push(j);for(h=b=0;b<2;++h)if(a[h].index!=-1){i.push(a[h].index);b++}for(j=i.length;h0} -d3.geom.polygon=function(c){c.area=function(){for(var h=0,f=c.length,a=c[f-1][0]*c[0][1],i=c[f-1][1]*c[0][0];++h=0){a=f.o.r;i=f.o.l}else{a=f.o.l;i=f.o.r}if(f.i==1){b=a?a.y:-1E6;a=f.c-f.b*b;j=i?i.y:1E6;i=f.c-f.b*j}else{a=a?a.x:-1E6;b=f.c-f.i*a;i=i?i.x:1E6;j=f.c-f.i*i}a=[a,b];i=[i,j];h[f.region.l.index].push(a,i);h[f.region.r.index].push(a,i)});return h.map(function(f,a){var i=c[a][0],b=c[a][1];f.forEach(function(j){j.a=Math.atan2(j[0]-i,j[1]-b)});return f.sort(function(j,m){return j.a-m.a}).filter(function(j, -m){return!m||j.a-f[m-1].a>1.0E-10})})};var E={l:"r",r:"l"}; -function D(c,h){var f={d:c.map(function(d,g){return{index:g,x:d[0],y:d[1]}}).sort(function(d,g){return d.yg.y?1:d.xg.x?1:0}),A:s},a={d:[],p:s,q:s,G:function(){a.p=a.t(s,"l");a.q=a.t(s,"l");a.p.r=a.q;a.q.l=a.p;a.d.unshift(a.p,a.q)},t:function(d,g){return{j:d,k:g,z:s,l:s,r:s}},m:function(d,g){g.l=d;g.r=d.r;d.r.l=g;d.r=g},H:function(d){var g=a.p;do g=g.r;while(g!=a.q&&i.J(g,d));return g=g.l},n:function(d){d.l.r=d.r;d.r.l=d.l;d.j=s},right:function(d){return d.r},left:function(d){return d.l}, -I:function(d){return d.j==s?f.A:d.j.region[d.k]},D:function(d){return d.j==s?f.A:d.j.region[E[d.k]]}},i={C:function(d,g){var e={region:{l:d,r:g},o:{l:s,r:s}},l=g.x-d.x,q=g.y-d.y,u=l>0?l:-l,t=q>0?q:-q;e.c=d.x*l+d.y*q+(l*l+q*q)*0.5;if(u>t){e.i=1;e.b=q/l;e.c/=l}else{e.b=1;e.i=l/q;e.c/=q}return e},w:function(d,g){var e=d.j,l=g.j;if(!e||!l||e.region.r==l.region.r)return s;var q=e.i*l.b-e.b*l.i;if(Math.abs(q)<1.0E-10)return s;var u=(e.c*l.b-l.c*e.b)/q;q=(l.c*e.i-e.c*l.i)/q;var t=e.region.r,z=l.region.r; -if(t.y=e.region.r.x)&&t.k=="l"||!e&&t.k=="r")return s;return{x:u,y:q}},J:function(d,g){var e=d.j,l=e.region.r,q=g.x>l.x;if(q&&d.k=="l")return 1;if(!q&&d.k=="r")return 0;if(e.i==1){var u=g.y-l.y,t=g.x-l.x,z=0,w=0;if(!q&&e.b<0||q&&e.b>=0)w=z=u>=e.b*t;else{w=g.x+g.y*e.b>e.c;if(e.b<0)w=!w;w||(z=1)}if(!z){l=l.x-e.region.l.x;w=e.b*(t*t-u*u)u*u+l*l}return d.k=="l"? -w:!w},B:function(d,g,e){d.o[g]=e;d.o[E[g]]&&h(d)},v:function(d,g){var e=d.x-g.x,l=d.y-g.y;return Math.sqrt(e*e+l*l)}},b={d:[],m:function(d,g,e){d.z=g;d.u=g.y+e;e=0;for(var l=b.d,q=l.length;eu.u||d.u==u.u&&g.x>u.z.x))break}l.splice(e,0,d)},n:function(d){for(var g=0,e=b.d,l=e.length;gn.y){k=v;v=n;n=k;k="r"}y=i.C(v,n);n=a.t(y,k);a.m(p,n);i.B(y,E[k],r);if(r=i.w(p,n)){b.n(p);b.m(p,r,i.v(r,v))}(r=i.w(n,x))&&b.m(n,r,i.v(r,v))}}for(k=a.right(a.p);k!=a.q;k=a.right(k))h(k.j)} -d3.geom.delaunay=function(c){var h=c.map(function(){return[]}),f=[];D(c,function(a){h[a.region.l.index].push(c[a.region.r.index])});h.forEach(function(a,i){var b=c[i],j=b[0],m=b[1];a.forEach(function(p){p.a=Math.atan2(p[0]-j,p[1]-m)});a.sort(function(p,x){return p.a-x.a});for(var k=0,o=a.length-1;k0}function z(c,h,f){return(f[0]-h[0])*(c[1]-h[1])<(f[1]-h[1])*(c[0]-h[0])}function B(c,h,f,a){var i=c[0],b=f[0];c=c[1];var j=f[1];f=h[0]-i;var m=a[0]-b;h=h[1]-c;a=a[1]-j;b=(m*(c-j)-a*(i-b))/(a*f-m*h);return[i+b*f,c+b*h]}function C(c,h){var f={list:c.map(function(d,g){return{index:g,x:d[0],y:d[1]}}).sort(function(d,g){return d.yg.y?1:d.xg.x?1:0}),bottomSite:null}, +a={list:[],leftEnd:null,rightEnd:null,init:function(){a.leftEnd=a.createHalfEdge(null,"l");a.rightEnd=a.createHalfEdge(null,"l");a.leftEnd.r=a.rightEnd;a.rightEnd.l=a.leftEnd;a.list.unshift(a.leftEnd,a.rightEnd)},createHalfEdge:function(d,g){return{edge:d,side:g,vertex:null,l:null,r:null}},insert:function(d,g){g.l=d;g.r=d.r;d.r.l=g;d.r=g},leftBound:function(d){var g=a.leftEnd;do g=g.r;while(g!=a.rightEnd&&i.rightOf(g,d));return g=g.l},del:function(d){d.l.r=d.r;d.r.l=d.l;d.edge=null},right:function(d){return d.r}, +left:function(d){return d.l},leftRegion:function(d){return d.edge==null?f.bottomSite:d.edge.region[d.side]},rightRegion:function(d){return d.edge==null?f.bottomSite:d.edge.region[A[d.side]]}},i={bisect:function(d,g){var e={region:{l:d,r:g},ep:{l:null,r:null}},l=g.x-d.x,o=g.y-d.y,t=l>0?l:-l,s=o>0?o:-o;e.c=d.x*l+d.y*o+(l*l+o*o)*0.5;if(t>s){e.a=1;e.b=o/l;e.c/=l}else{e.b=1;e.a=l/o;e.c/=o}return e},intersect:function(d,g){var e=d.edge,l=g.edge;if(!e||!l||e.region.r==l.region.r)return null;var o=e.a*l.b- +e.b*l.a;if(Math.abs(o)<1.0E-10)return null;var t=(e.c*l.b-l.c*e.b)/o;o=(l.c*e.a-e.c*l.a)/o;var s=e.region.r,y=l.region.r;if(s.y=e.region.r.x)&&s.side=="l"||!e&&s.side=="r")return null;return{x:t,y:o}},rightOf:function(d,g){var e=d.edge,l=e.region.r,o=g.x>l.x;if(o&&d.side=="l")return 1;if(!o&&d.side=="r")return 0;if(e.a==1){var t=g.y-l.y,s=g.x-l.x,y=0,v=0;if(!o&&e.b<0||o&&e.b>=0)v=y=t>=e.b*s;else{v=g.x+g.y*e.b>e.c;if(e.b<0)v=!v;v||(y=1)}if(!y){l= +l.x-e.region.l.x;v=e.b*(s*s-t*t)t*t+l*l}return d.side=="l"?v:!v},endPoint:function(d,g,e){d.ep[g]=e;d.ep[A[g]]&&h(d)},distance:function(d,g){var e=d.x-g.x,l=d.y-g.y;return Math.sqrt(e*e+l*l)}},b={list:[],insert:function(d,g,e){d.vertex=g;d.ystar=g.y+e;e=0;for(var l=b.list,o=l.length;et.ystar||d.ystar==t.ystar&&g.x>t.vertex.x))break}l.splice(e,0,d)},del:function(d){for(var g=0,e= +b.list,l=e.length;gn.y){k=u;u=n;n=k;k="r"}x=i.bisect(u,n);n=a.createHalfEdge(x, +k);a.insert(q,n);i.endPoint(x,A[k],r);if(r=i.intersect(q,n)){b.del(q);b.insert(q,r,i.distance(r,u))}(r=i.intersect(n,w))&&b.insert(n,r,i.distance(r,u))}}for(k=a.right(a.leftEnd);k!=a.rightEnd;k=a.right(k))h(k.edge)}d3.geom={};d3.geom.hull=function(c){if(c.length<3)return[];var h=c.length,f=h-1,a=[],i=[],b,j=0,m,k,p,q,w,n,u;for(b=1;b=p*p+q*q)a[b].index=-1;else{a[w].index=-1;u=a[b].angle;w=b;n=h}}else{u=a[b].angle;w=b;n=h}}i.push(j);for(h=b=0;b<2;++h)if(a[h].index!=-1){i.push(a[h].index);b++}for(j=i.length;h=0){a=f.ep.r;i=f.ep.l}else{a=f.ep.l;i=f.ep.r}if(f.a==1){b=a?a.y:-1E6;a=f.c-f.b*b;j=i?i.y:1E6;i=f.c-f.b*j}else{a=a?a.x:-1E6;b=f.c-f.a*a;i=i?i.x:1E6;j=f.c-f.a*i}a=[a,b];i=[i,j];h[f.region.l.index].push(a,i);h[f.region.r.index].push(a,i)});return h.map(function(f,a){var i=c[a][0],b=c[a][1];f.forEach(function(j){j.angle=Math.atan2(j[0]-i,j[1]-b)});return f.sort(function(j,m){return j.angle-m.angle}).filter(function(j,m){return!m||j.angle-f[m-1].angle>1.0E-10})})}; +var A={l:"r",r:"l"};d3.geom.delaunay=function(c){var h=c.map(function(){return[]}),f=[];C(c,function(a){h[a.region.l.index].push(c[a.region.r.index])});h.forEach(function(a,i){var b=c[i],j=b[0],m=b[1];a.forEach(function(q){q.angle=Math.atan2(q[0]-j,q[1]-m)});a.sort(function(q,w){return q.angle-w.angle});for(var k=0,p=a.length-1;k b ? 1 : 0; }; -d3["descending"] = function(a, b) { +d3.descending = function(a, b) { return b < a ? -1 : b > a ? 1 : 0; }; d3["merge"] = function(arrays) { return Array.prototype.concat.apply([], arrays); }; -d3["split"] = function(array, f) { +d3.split = function(array, f) { var arrays = [], values = [], value, @@ -69,7 +69,7 @@ d3.range = function(start, stop, step) { else while ((j = start + step * ++i) < stop) range.push(j); return range; }; -d3["requote"] = function(s) { +d3.requote = function(s) { return s.replace(d3_requote_re, "\\$&"); }; @@ -253,16 +253,16 @@ var d3_ease_quad = d3_ease_poly(2), d3_ease_cubic = d3_ease_poly(3); var d3_ease = { - "linear": function() { return d3_ease_linear; }, - "poly": d3_ease_poly, - "quad": function() { return d3_ease_quad; }, - "cubic": function() { return d3_ease_cubic; }, - "sin": function() { return d3_ease_sin; }, - "exp": function() { return d3_ease_exp; }, - "circle": function() { return d3_ease_circle; }, - "elastic": d3_ease_elastic, - "back": d3_ease_back, - "bounce": function() { return d3_ease_bounce; } + linear: function() { return d3_ease_linear; }, + poly: d3_ease_poly, + quad: function() { return d3_ease_quad; }, + cubic: function() { return d3_ease_cubic; }, + sin: function() { return d3_ease_sin; }, + exp: function() { return d3_ease_exp; }, + circle: function() { return d3_ease_circle; }, + elastic: d3_ease_elastic, + back: d3_ease_back, + bounce: function() { return d3_ease_bounce; } }; var d3_ease_mode = { @@ -595,153 +595,153 @@ function d3_rgb_parseNumber(c) { // either integer or percentage } var d3_rgb_names = { - "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" + 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" }; for (var d3_rgb_name in d3_rgb_names) { @@ -1964,7 +1964,7 @@ d3.scale.quantile = function() { return scale; }; d3.svg = {}; -d3["svg"]["arc"] = function() { +d3.svg.arc = function() { var innerRadius = d3_svg_arcInnerRadius, outerRadius = d3_svg_arcOuterRadius, startAngle = d3_svg_arcStartAngle, @@ -2006,25 +2006,25 @@ d3["svg"]["arc"] = function() { + "Z"); } - arc["innerRadius"] = function(v) { + arc.innerRadius = function(v) { if (!arguments.length) return innerRadius; innerRadius = d3_functor(v); return arc; }; - arc["outerRadius"] = function(v) { + arc.outerRadius = function(v) { if (!arguments.length) return outerRadius; outerRadius = d3_functor(v); return arc; }; - arc["startAngle"] = function(v) { + arc.startAngle = function(v) { if (!arguments.length) return startAngle; startAngle = d3_functor(v); return arc; }; - arc["endAngle"] = function(v) { + arc.endAngle = function(v) { if (!arguments.length) return endAngle; endAngle = d3_functor(v); return arc; @@ -2036,21 +2036,21 @@ d3["svg"]["arc"] = function() { var d3_svg_arcOffset = -Math.PI / 2; function d3_svg_arcInnerRadius(d) { - return d["innerRadius"]; + return d.innerRadius; } function d3_svg_arcOuterRadius(d) { - return d["outerRadius"]; + return d.outerRadius; } function d3_svg_arcStartAngle(d) { - return d["startAngle"]; + return d.startAngle; } function d3_svg_arcEndAngle(d) { - return d["endAngle"]; + return d.endAngle; } -d3["svg"]["line"] = function() { +d3.svg.line = function() { var x = d3_svg_lineX, y = d3_svg_lineY, interpolate = "linear", @@ -2061,19 +2061,19 @@ d3["svg"]["line"] = function() { : "M" + interpolator(d3_svg_linePoints(this, d, x, y)); } - line["x"] = function(v) { + line.x = function(v) { if (!arguments.length) return x; x = v; return line; }; - line["y"] = function(v) { + line.y = function(v) { if (!arguments.length) return y; y = v; return line; }; - line["interpolate"] = function(v) { + line.interpolate = function(v) { if (!arguments.length) return interpolate; interpolator = d3_svg_lineInterpolators[interpolate = v]; return line; @@ -2115,7 +2115,7 @@ function d3_svg_linePoints(self, d, x, y) { * the given datum. */ function d3_svg_lineX(d) { - return d["x"]; + return d.x; } /** @@ -2123,7 +2123,7 @@ function d3_svg_lineX(d) { * the given datum. */ function d3_svg_lineY(d) { - return d["y"]; + return d.y; } /** @@ -2206,7 +2206,7 @@ function d3_svg_lineBasisBezier(path, x, y) { ",", d3_svg_lineDot4(d3_svg_lineBasisBezier3, x), ",", d3_svg_lineDot4(d3_svg_lineBasisBezier3, y)); } -d3["svg"]["area"] = function() { +d3.svg.area = function() { var x = d3_svg_lineX, y0 = d3_svg_areaY0, y1 = d3_svg_lineY, @@ -2222,25 +2222,25 @@ d3["svg"]["area"] = function() { + "Z"; } - area["x"] = function(v) { + area.x = function(v) { if (!arguments.length) return x; x = v; return area; }; - area["y0"] = function(v) { + area.y0 = function(v) { if (!arguments.length) return y0; y0 = v; return area; }; - area["y1"] = function(v) { + area.y1 = function(v) { if (!arguments.length) return y1; y1 = v; return area; }; - area["interpolate"] = function(v) { + area.interpolate = function(v) { if (!arguments.length) return interpolate; interpolator = d3_svg_lineInterpolators[interpolate = v]; return area; @@ -2252,7 +2252,7 @@ d3["svg"]["area"] = function() { function d3_svg_areaY0() { return 0; } -d3["svg"]["chord"] = function() { +d3.svg.chord = function() { var source = d3_svg_chordSource, target = d3_svg_chordTarget, radius = d3_svg_chordRadius, @@ -2299,31 +2299,31 @@ d3["svg"]["chord"] = function() { return "Q 0,0 " + p1; } - chord["radius"] = function(v) { + chord.radius = function(v) { if (!arguments.length) return radius; radius = d3_functor(v); return chord; }; - chord["source"] = function(v) { + chord.source = function(v) { if (!arguments.length) return source; source = d3_functor(v); return chord; }; - chord["target"] = function(v) { + chord.target = function(v) { if (!arguments.length) return target; target = d3_functor(v); return chord; }; - chord["startAngle"] = function(v) { + chord.startAngle = function(v) { if (!arguments.length) return startAngle; startAngle = d3_functor(v); return chord; }; - chord["endAngle"] = function(v) { + chord.endAngle = function(v) { if (!arguments.length) return endAngle; endAngle = d3_functor(v); return chord; @@ -2333,23 +2333,23 @@ d3["svg"]["chord"] = function() { }; function d3_svg_chordSource(d) { - return d["source"]; + return d.source; } function d3_svg_chordTarget(d) { - return d["target"]; + return d.target; } function d3_svg_chordRadius(d) { - return d["radius"]; + return d.radius; } function d3_svg_chordStartAngle(d) { - return d["startAngle"]; + return d.startAngle; } function d3_svg_chordEndAngle(d) { - return d["endAngle"]; + return d.endAngle; } d3.svg.mouse = function(container) { var point = (container.ownerSVGElement || container).createSVGPoint(); @@ -2376,3 +2376,4 @@ d3.svg.mouse = function(container) { // https://bugs.webkit.org/show_bug.cgi?id=44083 var d3_mouse_bug44083 = /WebKit/.test(navigator.userAgent) ? -1 : 0; +})() \ No newline at end of file diff --git a/d3.layout.js b/d3.layout.js index ea301db0b02c9..11d451a72abfe 100644 --- a/d3.layout.js +++ b/d3.layout.js @@ -1,5 +1,5 @@ -d3["layout"] = {}; -d3["layout"]["chord"] = function() { +(function(){d3.layout = {}; +d3.layout.chord = function() { var chord = {}, chords, groups, @@ -83,7 +83,7 @@ d3["layout"]["chord"] = function() { j = i - 1; while (++j < n) { var source = subgroups[i + "-" + j], target = subgroups[j + "-" + i]; - if (source["value"] || target["value"]) { + if (source.value || target.value) { chords.push({ "source": source, "target": target @@ -97,56 +97,57 @@ d3["layout"]["chord"] = function() { function resort() { chords.sort(function(a, b) { - a = Math.min(a["source"]["value"], a["target"]["value"]); - b = Math.min(b["source"]["value"], b["target"]["value"]); + a = Math.min(a.source.value, a.target.value); + b = Math.min(b.source.value, b.target.value); return sortChords(a, b); }); } - chord["matrix"] = function(x) { + chord.matrix = function(x) { if (!arguments.length) return matrix; n = (matrix = x) && matrix.length; chords = groups = null; return chord; }; - chord["padding"] = function(x) { + chord.padding = function(x) { if (!arguments.length) return padding; padding = x; chords = groups = null; return chord; }; - chord["sortGroups"] = function(x) { + chord.sortGroups = function(x) { if (!arguments.length) return sortGroups; sortGroups = x; chords = groups = null; return chord; }; - chord["sortSubgroups"] = function(x) { + chord.sortSubgroups = function(x) { if (!arguments.length) return sortSubgroups; sortSubgroups = x; chords = null; return chord; }; - chord["sortChords"] = function(x) { + chord.sortChords = function(x) { if (!arguments.length) return sortChords; sortChords = x; if (chords) resort(); return chord; }; - chord["chords"] = function() { + chord.chords = function() { if (!chords) relayout(); return chords; }; - chord["groups"] = function() { + chord.groups = function() { if (!groups) relayout(); return groups; }; return chord; }; +})() \ No newline at end of file diff --git a/d3.layout.min.js b/d3.layout.min.js index bdcbc8c5469cb..9b31b33f7733e 100644 --- a/d3.layout.min.js +++ b/d3.layout.min.js @@ -1,4 +1,3 @@ -(function(){d3.layout={}; -d3.layout.chord=function(){function v(){var a={},h=[],m=d3.range(f),k=[],l,d,t,c,e;g=[];i=[];l=0;for(c=-1;++cb?1:0};d3.descending=function(a,b){return ba?1:0};d3.merge=function(a){return Array.prototype.concat.apply([],a)}; -d3.split=function(a,b){var c=[],f=[],d,e=-1,h=a.length;if(arguments.length<2)b=aa;for(;++eb;)f.push(e);else for(;(e=a+c*++d)=0?g.substring(i):(i=g.length,""),l=[];i>0;)l.push(g.substring(i-=3,i+3));g=l.reverse().join(",")+j}i=g.length;if(i=^]))?([+\- ])?(#)?(0)?([0-9]+)?(,)?(\.[0-9]+)?([a-zA-Z%])?/,fa=F(2),ga=F(3),oa={linear:function(){return ha},poly:F,quad:function(){return fa},cubic:function(){return ga},sin:function(){return ia},exp:function(){return ja},circle:function(){return ka},elastic:la,back:ma,bounce:function(){return na}},ra={"in":function(a){return a},out:pa,"in-out":qa,"out-in":function(a){return qa(pa(a))}}; -d3.ease=function(a){var b=a.indexOf("-");return ra[b>=0?a.substring(b+1):"in"](oa[b>=0?a.substring(0,b):a].apply(o,Array.prototype.slice.call(arguments,1)))};function pa(a){return function(b){return 1-a(1-b)}}function qa(a){return function(b){return 0.5*(b<0.5?a(2*b):2-a(2-2*b))}}function ha(a){return a}function F(a){return function(b){return Math.pow(b,a)}}function ia(a){return 1-Math.cos(a*Math.PI/2)}function ja(a){return a?Math.pow(2,10*(a-1))-0.0010:0} -function ka(a){return 1-Math.sqrt(1-a*a)}function la(a,b){var c;if(arguments.length<2)b=0.45;if(arguments.length<1){a=1;c=b/4}else c=b/(2*Math.PI)*Math.asin(1/a);return function(f){return 1+a*Math.pow(2,10*-f)*Math.sin((f-c)*2*Math.PI/b)}}function ma(a){a||(a=1.70158);return function(b){return b*b*((a+1)*b-a)}}function na(a){return a<1/2.75?7.5625*a*a:a<2/2.75?7.5625*(a-=1.5/2.75)*a+0.75:a<2.5/2.75?7.5625*(a-=2.25/2.75)*a+0.9375:7.5625*(a-=2.625/2.75)*a+0.984375}d3.event=o; -d3.interpolate=function(a,b){if(typeof b=="number")return d3.interpolateNumber(+a,b);if(typeof b=="string")return b in G||/^(#|rgb\(|hsl\()/.test(b)?d3.interpolateRgb(String(a),b):d3.interpolateString(String(a),b);if(b instanceof Array)return d3.interpolateArray(a,b);return d3.interpolateObject(a,b)};d3.interpolateNumber=function(a,b){b-=a;return function(c){return a+b*c}}; -d3.interpolateString=function(a,b){var c,f,d=0,e=[],h=[],g,i;for(f=0;c=H.exec(b);++f){c.index&&e.push(b.substring(d,c.index));h.push({a:e.length,x:c[0]});e.push(o);d=H.lastIndex}d360)h-=360;else if(h<0)h+=360;if(h<60)return d+(e-d)*h/60;if(h<180)return e;if(h<240)return d+(e-d)*(240-h)/60;return d}var d,e;a%=360;if(a<0)a+=360;b=b<0?0:b>1?1:b;c=c<0?0:c>1?1:c;e=c<=0.5?c*(1+b):c+b-c*b;d=2*c-e;return J(Math.round(f(a+120)*255),Math.round(f(a)*255),Math.round(f(a-120)*255))}var P=O([[document]]);P[0].parentNode=document.documentElement; -d3.select=function(a){return typeof a=="string"?P.select(a):O([[a]])};d3.selectAll=function(a){return typeof a=="string"?P.selectAll(a):O([x(a)])}; -function O(a){function b(d){for(var e=[],h,g,i,j,l=0,p=a.length;lf){i[r]=2;return}else{i[r]=1;g.start.dispatch.apply(this,arguments);v=e[r]={};t.d=f;for(s in d)v[s]=d[s].apply(this,arguments)}u=q(m);for(s in d)v[s].call(this,u);if(m==1){i[r]=2;if(t.d==f){m=t.o;if(m==f){delete this.__transition__;h&&this.parentNode.removeChild(this)}R=f;g.end.dispatch.apply(this, -arguments);R=0;t.o=m}}}});return n}var c={},f=R||++za,d={},e=[],h=false,g=d3.dispatch("start","end"),i=[],j=[],l=[],p,q=d3.ease("cubic-in-out");a.each(function(){(this.__transition__||(this.__transition__={})).o=f});c.delay=function(k){var n=Infinity,r=-1;if(typeof k=="function")a.each(function(){var m=j[++r]=+k.apply(this,arguments);if(mp)p=r})}else{p=+k;a.each(function(){l[++n]=p})}return c};c.ease=function(k){q=typeof k=="string"?d3.ease(k):k;return c};c.attrTween=function(k,n){function r(t,u){var s=n.call(this,t,u,this.getAttribute(k));return function(v){this.setAttribute(k,s(v))}}function m(t,u){var s=n.call(this,t,u,this.getAttributeNS(k.space,k.local));return function(v){this.setAttributeNS(k.space,k.local,s(v))}}d["attr."+k]=k.local?m:r;return c};c.attr=function(k,n){return c.attrTween(k,Ba(n))};c.styleTween= -function(k,n,r){d["style."+k]=function(m,t){var u=n.call(this,m,t,window.getComputedStyle(this,o).getPropertyValue(k));return function(s){this.style.setProperty(k,u(s),r)}};return c};c.style=function(k,n,r){return c.styleTween(k,Ba(n),r)};c.select=function(k){var n;k=Q(a.select(k)).ease(q);n=-1;k.delay(function(){return j[++n]});n=-1;k.duration(function(){return l[++n]});return k};c.selectAll=function(k){var n;k=Q(a.selectAll(k)).ease(q);n=-1;k.delay(function(r,m){return j[m?n:++n]});n=-1;k.duration(function(r, -m){return l[m?n:++n]});return k};c.remove=function(){h=true;return c};c.each=function(k,n){g[k].add(n);return c};c.call=ba;return c.delay(0).duration(250)}var S=o,T=0,U;function Aa(a,b){var c=Date.now(),f=false,d=c+b,e=S;if(isFinite(b)){for(;e;){if(e.n==a){e.j=c;e.delay=b;f=true}else{var h=e.j+e.delay;if(hc.delay)c.t=c.n(a);c=c.next}a=o;for(b=S;b;)b=b.t?a?a.next=b.next:S=b.next:(a=b).next;a||(U=clearInterval(U))}function Ba(a){return typeof a=="function"?function(b,c,f){return d3.interpolate(f,a.call(this,b,c))}:function(b,c,f){return d3.interpolate(f,a)}}d3.scale={}; -d3.scale.linear=function(){function a(j){return i((j-c)*h)}function b(j){var l=Math.min(c,f),p=Math.max(c,f),q=p-l,k=Math.pow(10,Math.floor(Math.log(q/j)/Math.LN10));j=j/(q/k);if(j<=0.15)k*=10;else if(j<=0.35)k*=5;else if(j<=0.75)k*=2;return{start:Math.ceil(l/k)*k,stop:Math.floor(p/k)*k+k*0.5,q:k}}var c=0,f=1,d=0,e=1,h=1/(f-c),g=(f-c)/(e-d),i=d3.interpolate(d,e);a.invert=function(j){return(j-d)*g+c};a.domain=function(j){if(!arguments.length)return[c,f];c=j[0];f=j[1];h=1/(f-c);g=(f-c)/(e-d);return a}; -a.range=function(j){if(!arguments.length)return[d,e];d=j[0];e=j[1];g=(f-c)/(e-d);i=d3.interpolate(d,e);return a};a.ticks=function(j){j=b(j);return d3.range(j.start,j.stop,j.q)};a.tickFormat=function(j){return d3.format(",."+Math.max(0,-Math.floor(Math.log(b(j).q)/Math.LN10+0.01))+"f")};return a}; -d3.scale.log=function(){function a(d){return Math.log(d)/Math.LN10}function b(d){return Math.pow(10,d)}function c(d){return f(a(d))}var f=d3.scale.linear();c.invert=function(d){return b(f.invert(d))};c.domain=function(d){if(!arguments.length)return f.domain().map(b);f.domain(d.map(a));return c};c.range=function(){var d=f.range.apply(f,arguments);return arguments.length?c:d};c.ticks=function(){var d=f.domain(),e=Math.floor(d[0]),h=Math.ceil(d[1]),g=[];if(d.every(isFinite)){for(;++e<=h;)for(d=1;d<10;d++)g.push(b(e)* -d);g.push(b(e))}return g};c.tickFormat=function(){return function(d){return d.toPrecision(1)}};return c}; -d3.scale.pow=function(){function a(h){return Math.pow(h,d)}function b(h){return Math.pow(h,e)}function c(h){return f(a(h))}var f=d3.scale.linear(),d=1,e=1/d;c.invert=function(h){return b(f.invert(h))};c.domain=function(h){if(!arguments.length)return f.domain().map(b);f.domain(h.map(a));return c};c.range=function(){var h=f.range.apply(f,arguments);return arguments.length?c:h};c.ticks=function(h){return d3.scale.linear().domain(c.domain()).ticks(h)};c.tickFormat=function(h){return d3.scale.linear().domain(c.domain()).tickFormat(h)}; -c.exponent=function(h){if(!arguments.length)return d;var g=c.domain();d=h;e=1/h;return c.domain(g)};return c};d3.scale.sqrt=function(){return d3.scale.pow().exponent(0.5)}; -d3.scale.ordinal=function(){function a(e){e=e in c?c[e]:c[e]=b.push(e)-1;return f[e%f.length]}var b=[],c={},f=[],d=0;a.domain=function(e){if(!arguments.length)return b;b=e;c={};for(var h=-1,g=-1,i=b.length;++h>1,l=e[j];if(lh)i=j-1;else return j}return i<0?0:i}function c(h){return d[b(h)]}var f=[],d=[],e=[];c.domain=function(h){if(!arguments.length)return f;f=h.filter(function(g){return!isNaN(g)}).sort(d3.ascending);a();return c};c.range=function(h){if(!arguments.length)return d;d=h;a();return c}; -c.u=function(){return e};return c};d3.svg={}; -d3.svg.arc=function(){function a(e,h){var g=b.call(this,e,h),i=c.call(this,e,h),j=f.call(this,e,h)+V,l=d.call(this,e,h)+V,p=l-j,q=p=2*Math.PI?g?"M0,"+i+"A"+i+","+i+" 0 1,1 0,"+-i+"A"+i+","+i+" 0 1,1 0,"+i+"M0,"+g+"A"+g+","+g+" 0 1,1 0,"+-g+"A"+g+","+g+" 0 1,1 0,"+g+"Z":"M0,"+i+"A"+i+","+i+" 0 1,1 0,"+-i+"A"+i+","+i+" 0 1,1 0,"+i+"Z":g?"M"+i*k+","+i*j+"A"+i+","+i+" 0 "+q+",1 "+i*n+","+i*l+"L"+g*n+","+g*l+"A"+g+","+ -g+" 0 "+q+",0 "+g*k+","+g*j+"Z":"M"+i*k+","+i*j+"A"+i+","+i+" 0 "+q+",1 "+i*n+","+i*l+"L0,0Z"}var b=Ja,c=Ka,f=La,d=Ma;a.innerRadius=function(e){if(!arguments.length)return b;b=y(e);return a};a.outerRadius=function(e){if(!arguments.length)return c;c=y(e);return a};a.startAngle=function(e){if(!arguments.length)return f;f=y(e);return a};a.endAngle=function(e){if(!arguments.length)return d;d=y(e);return a};return a};var V=-Math.PI/2;function Ja(a){return a.innerRadius} -function Ka(a){return a.outerRadius}function La(a){return a.startAngle}function Ma(a){return a.endAngle}d3.svg.line=function(){function a(e){return e.length<1?o:"M"+d(W(this,e,b,c))}var b=Na,c=Oa,f="linear",d=X[f];a.x=function(e){if(!arguments.length)return b;b=e;return a};a.y=function(e){if(!arguments.length)return c;c=e;return a};a.interpolate=function(e){if(!arguments.length)return f;d=X[f=e];return a};return a}; -function W(a,b,c,f){var d=[],e=-1,h=b.length,g=typeof c=="function",i=typeof f=="function",j;if(g&&i)for(;++e360)h-=360;else if(h<0)h+=360;if(h<60)return d+(e-d)*h/60;if(h<180)return e;if(h<240)return d+(e-d)*(240-h)/60;return d}var d,e;a%=360;if(a<0)a+=360;b=b<0?0:b>1?1:b;c=c<0?0:c>1?1:c;e=c<=0.5?c*(1+b):c+b- +c*b;d=2*c-e;return G(Math.round(f(a+120)*255),Math.round(f(a)*255),Math.round(f(a-120)*255))}function x(a){function b(d){for(var e=[],h,g,i,j,l=0,o=a.length;lf){i[q]=2;return}else{i[q]=1;g.start.dispatch.apply(this,arguments);u=e[q]={};s.active=f;for(r in d)u[r]=d[r].apply(this,arguments)}t=p(m);for(r in d)u[r].call(this,t);if(m==1){i[q]=2;if(s.active==f){m=s.owner;if(m==f){delete this.__transition__; +h&&this.parentNode.removeChild(this)}S=f;g.end.dispatch.apply(this,arguments);S=0;s.owner=m}}}});return n}var c={},f=S||++za,d={},e=[],h=false,g=d3.dispatch("start","end"),i=[],j=[],l=[],o,p=d3.ease("cubic-in-out");a.each(function(){(this.__transition__||(this.__transition__={})).owner=f});c.delay=function(k){var n=Infinity,q=-1;if(typeof k=="function")a.each(function(){var m=j[++q]=+k.apply(this,arguments);if(mo)o=q})}else{o=+k;a.each(function(){l[++n]=o})}return c};c.ease=function(k){p=typeof k=="string"?d3.ease(k):k;return c};c.attrTween=function(k,n){function q(s,t){var r=n.call(this,s,t,this.getAttribute(k));return function(u){this.setAttribute(k,r(u))}}function m(s,t){var r=n.call(this,s,t,this.getAttributeNS(k.space,k.local));return function(u){this.setAttributeNS(k.space,k.local,r(u))}}d["attr."+k]=k.local? +m:q;return c};c.attr=function(k,n){return c.attrTween(k,da(n))};c.styleTween=function(k,n,q){d["style."+k]=function(m,s){var t=n.call(this,m,s,window.getComputedStyle(this,null).getPropertyValue(k));return function(r){this.style.setProperty(k,t(r),q)}};return c};c.style=function(k,n,q){return c.styleTween(k,da(n),q)};c.select=function(k){var n;k=R(a.select(k)).ease(p);n=-1;k.delay(function(){return j[++n]});n=-1;k.duration(function(){return l[++n]});return k};c.selectAll=function(k){var n;k=R(a.selectAll(k)).ease(p); +n=-1;k.delay(function(q,m){return j[m?n:++n]});n=-1;k.duration(function(q,m){return l[m?n:++n]});return k};c.remove=function(){h=true;return c};c.each=function(k,n){g[k].add(n);return c};c.call=$;return c.delay(0).duration(250)}function Aa(a,b){var c=Date.now(),f=false,d=c+b,e=D;if(isFinite(b)){for(;e;){if(e.callback==a){e.then=c;e.delay=b;f=true}else{var h=e.then+e.delay;if(hc.delay)c.flush=c.callback(a);c=c.next}a=null;for(b=D;b;)b=b.flush?a?a.next=b.next:D=b.next:(a=b).next;a||(H=clearInterval(H))}function da(a){return typeof a=="function"?function(b,c,f){return d3.interpolate(f,a.call(this,b,c))}:function(b,c,f){return d3.interpolate(f,a)}}function Da(a){return a.innerRadius}function Ea(a){return a.outerRadius}function ea(a){return a.startAngle}function fa(a){return a.endAngle}function U(a, +b,c,f){var d=[],e=-1,h=b.length,g=typeof c=="function",i=typeof f=="function",j;if(g&&i)for(;++eb?1:0};d3.descending=function(a,b){return b< +a?-1:b>a?1:0};d3.merge=function(a){return Array.prototype.concat.apply([],a)};d3.split=function(a,b){var c=[],f=[],d,e=-1,h=a.length;if(arguments.length<2)b=ma;for(;++eb;)f.push(e);else for(;(e=a+c*++d)=0?g.substring(i):(i=g.length,""),l=[];i>0;)l.push(g.substring(i-=3,i+3));g=l.reverse().join(",")+j}i=g.length;if(i< +f)g=Array(f-i+1).join(b)+g;return g}};var Ka=/(?:([^{])?([<>=^]))?([+\- ])?(#)?(0)?([0-9]+)?(,)?(\.[0-9]+)?([a-zA-Z%])?/,La=M(2),Ma=M(3),Na={linear:function(){return oa},poly:M,quad:function(){return La},cubic:function(){return Ma},sin:function(){return pa},exp:function(){return qa},circle:function(){return ra},elastic:function(a,b){var c;if(arguments.length<2)b=0.45;if(arguments.length<1){a=1;c=b/4}else c=b/(2*Math.PI)*Math.asin(1/a);return function(f){return 1+a*Math.pow(2,10*-f)*Math.sin((f-c)* +2*Math.PI/b)}},back:function(a){a||(a=1.70158);return function(b){return b*b*((a+1)*b-a)}},bounce:function(){return sa}},Oa={"in":function(a){return a},out:aa,"in-out":ba,"out-in":function(a){return ba(aa(a))}};d3.ease=function(a){var b=a.indexOf("-"),c=b>=0?a.substring(0,b):a;b=b>=0?a.substring(b+1):"in";return Oa[b](Na[c].apply(null,Array.prototype.slice.call(arguments,1)))};d3.event=null;d3.interpolate=function(a,b){if(typeof b=="number")return d3.interpolateNumber(+a,b);if(typeof b=="string")return b in +F||/^(#|rgb\(|hsl\()/.test(b)?d3.interpolateRgb(String(a),b):d3.interpolateString(String(a),b);if(b instanceof Array)return d3.interpolateArray(a,b);return d3.interpolateObject(a,b)};d3.interpolateNumber=function(a,b){b-=a;return function(c){return a+b*c}};d3.interpolateString=function(a,b){var c,f,d=0,e=[],h=[],g,i;for(f=0;c=W.exec(b);++f){c.index&&e.push(b.substring(d,c.index));h.push({i:e.length,x:c[0]});e.push(null);d=W.lastIndex}d>1,l=e[j];if(lh)i=j-1;else return j}return i<0?0:i}function c(h){return d[b(h)]}var f=[],d=[],e=[];c.domain=function(h){if(!arguments.length)return f;f=h.filter(function(g){return!isNaN(g)}).sort(d3.ascending);a();return c};c.range=function(h){if(!arguments.length)return d;d=h;a();return c};c.quantiles=function(){return e};return c};d3.svg= +{};d3.svg.arc=function(){function a(e,h){var g=b.call(this,e,h),i=c.call(this,e,h),j=f.call(this,e,h)+J,l=d.call(this,e,h)+J,o=l-j,p=o=2*Math.PI?g?"M0,"+i+"A"+i+","+i+" 0 1,1 0,"+-i+"A"+i+","+i+" 0 1,1 0,"+i+"M0,"+g+"A"+g+","+g+" 0 1,1 0,"+-g+"A"+g+","+g+" 0 1,1 0,"+g+"Z":"M0,"+i+"A"+i+","+i+" 0 1,1 0,"+-i+"A"+i+","+i+" 0 1,1 0,"+i+"Z":g?"M"+i*k+","+i*j+"A"+i+","+i+" 0 "+p+",1 "+i*n+","+i*l+"L"+g*n+","+g*l+"A"+g+ +","+g+" 0 "+p+",0 "+g*k+","+g*j+"Z":"M"+i*k+","+i*j+"A"+i+","+i+" 0 "+p+",1 "+i*n+","+i*l+"L0,0Z"}var b=Da,c=Ea,f=ea,d=fa;a.innerRadius=function(e){if(!arguments.length)return b;b=w(e);return a};a.outerRadius=function(e){if(!arguments.length)return c;c=w(e);return a};a.startAngle=function(e){if(!arguments.length)return f;f=w(e);return a};a.endAngle=function(e){if(!arguments.length)return d;d=w(e);return a};return a};var J=-Math.PI/2;d3.svg.line=function(){function a(e){return e.length<1?null:"M"+ +d(U(this,e,b,c))}var b=ga,c=ha,f="linear",d=K[f];a.x=function(e){if(!arguments.length)return b;b=e;return a};a.y=function(e){if(!arguments.length)return c;c=e;return a};a.interpolate=function(e){if(!arguments.length)return f;d=K[f=e];return a};return a};var K={linear:ia,basis:function(a){if(a.length<3)return ia(a);var b=[],c=1,f=a.length,d=a[0],e=d[0],h=d[1],g=[e,e,e,(d=a[1])[0]],i=[h,h,h,d[1]];b.push(e,",",h);for(V(b,g,i);++c= 12 ? "PM" : "AM"; }, - "S": function(d) { return d3_time_zfill2(d.getSeconds()); }, - "U": d3_time_weekNumberSunday, - "w": function(d) { return d.getDay(); }, - "W": d3_time_weekNumberMonday, - "x": d3.time.format("%m/%d/%y"), - "X": d3.time.format("%H:%M:%S"), - "y": function(d) { return d3_time_zfill2(d.getYear() % 100); }, - "Y": function(d) { return d3_time_zfill4(d.getFullYear() % 10000); }, - "Z": d3_time_zone, + a: function(d) { return d3_time_weekdays[d.getDay()].substring(0, 3); }, + A: function(d) { return d3_time_weekdays[d.getDay()]; }, + b: function(d) { return d3_time_months[d.getMonth()].substring(0, 3); }, + B: function(d) { return d3_time_months[d.getMonth()]; }, + c: d3.time.format("%a %b %e %H:%M:%S %Y"), + d: function(d) { return d3_time_zfill2(d.getDate()); }, + e: function(d) { return d3_time_sfill2(d.getDate()); }, + H: function(d) { return d3_time_zfill2(d.getHours()); }, + I: function(d) { return d3_time_zfill2(d.getHours() % 12 || 12); }, + j: d3_time_dayOfYear, + m: function(d) { return d3_time_zfill2(d.getMonth() + 1); }, + M: function(d) { return d3_time_zfill2(d.getMinutes()); }, + p: function(d) { return d.getHours() >= 12 ? "PM" : "AM"; }, + S: function(d) { return d3_time_zfill2(d.getSeconds()); }, + U: d3_time_weekNumberSunday, + w: function(d) { return d.getDay(); }, + W: d3_time_weekNumberMonday, + x: d3.time.format("%m/%d/%y"), + X: d3.time.format("%H:%M:%S"), + y: function(d) { return d3_time_zfill2(d.getYear() % 100); }, + Y: function(d) { return d3_time_zfill4(d.getFullYear() % 10000); }, + Z: d3_time_zone, "%": function(d) { return "%"; } }; var d3_time_parsers = { - "a": d3_time_parseWeekdayAbbrev, - "A": d3_time_parseWeekday, - "b": d3_time_parseMonthAbbrev, - "B": d3_time_parseMonth, - "c": d3_time_parseLocaleFull, - "d": d3_time_parseDay, - "e": d3_time_parseDay, - "H": d3_time_parseHour24, - "I": d3_time_parseHour12, - // "j": function(d, s, i) { /*TODO day of year [001,366] */ return i; }, - "m": d3_time_parseMonthNumber, - "M": d3_time_parseMinutes, - "p": d3_time_parseAmPm, - "S": d3_time_parseSeconds, - // "U": function(d, s, i) { /*TODO week number (sunday) [00,53] */ return i; }, - // "w": function(d, s, i) { /*TODO weekday [0,6] */ return i; }, - // "W": function(d, s, i) { /*TODO week number (monday) [00,53] */ return i; }, - "x": d3_time_parseLocaleDate, - "X": d3_time_parseLocaleTime, - "y": d3_time_parseYear, - "Y": d3_time_parseFullYear + a: d3_time_parseWeekdayAbbrev, + A: d3_time_parseWeekday, + b: d3_time_parseMonthAbbrev, + B: d3_time_parseMonth, + c: d3_time_parseLocaleFull, + d: d3_time_parseDay, + e: d3_time_parseDay, + H: d3_time_parseHour24, + I: d3_time_parseHour12, + // j: function(d, s, i) { /*TODO day of year [001,366] */ return i; }, + m: d3_time_parseMonthNumber, + M: d3_time_parseMinutes, + p: d3_time_parseAmPm, + S: d3_time_parseSeconds, + // U: function(d, s, i) { /*TODO week number (sunday) [00,53] */ return i; }, + // w: function(d, s, i) { /*TODO weekday [0,6] */ return i; }, + // W: function(d, s, i) { /*TODO week number (monday) [00,53] */ return i; }, + x: d3_time_parseLocaleDate, + X: d3_time_parseLocaleTime, + y: d3_time_parseYear, + Y: d3_time_parseFullYear // , - // "Z": function(d, s, i) { /*TODO time zone */ return i; }, + // Z: function(d, s, i) { /*TODO time zone */ return i; }, // "%": function(d, s, i) { /*TODO literal % */ return i; } }; @@ -124,13 +124,13 @@ function d3_time_parseWeekdayAbbrev(date, string, i) { } var d3_time_weekdayAbbrevLookup = { - "sun": 3, - "mon": 3, - "tue": 3, - "wed": 3, - "thu": 3, - "fri": 3, - "sat": 3 + sun: 3, + mon: 3, + tue: 3, + wed: 3, + thu: 3, + fri: 3, + sat: 3 }; // Note: weekday is validated, but does not set the date. @@ -158,18 +158,18 @@ function d3_time_parseMonthAbbrev(date, string, i) { } var d3_time_monthAbbrevLookup = { - "jan": 0, - "feb": 1, - "mar": 2, - "apr": 3, - "may": 4, - "jun": 5, - "jul": 6, - "aug": 7, - "sep": 8, - "oct": 9, - "nov": 10, - "dec": 11 + jan: 0, + feb: 1, + mar: 2, + apr: 3, + may: 4, + jun: 5, + jul: 6, + aug: 7, + sep: 8, + oct: 9, + nov: 10, + dec: 11 }; function d3_time_parseMonth(date, string, i) { @@ -181,18 +181,18 @@ function d3_time_parseMonth(date, string, i) { var d3_time_monthRe = /^(?:January|February|March|April|May|June|July|August|September|October|November|December)/ig; var d3_time_monthLookup = { - "january": 0, - "february": 1, - "march": 2, - "april": 3, - "may": 4, - "june": 5, - "july": 6, - "august": 7, - "september": 8, - "october": 9, - "november": 10, - "december": 11 + january: 0, + february: 1, + march: 2, + april: 3, + may: 4, + june: 5, + july: 6, + august: 7, + september: 8, + october: 9, + november: 10, + december: 11 }; var d3_time_months = [ @@ -285,8 +285,8 @@ function d3_time_parseAmPm(date, string, i) { } var d3_time_amPmLookup = { - "am": 0, - "pm": 1 + am: 0, + pm: 1 }; function d3_time_dayOfYear(d) { @@ -311,3 +311,4 @@ function d3_time_zone(d) { zm = Math.abs(z) % 60; return zs + d3_time_zfill2(zh) + d3_time_zfill2(zm); } +})() \ No newline at end of file diff --git a/d3.time.min.js b/d3.time.min.js index 36ca09268dc67..cce37352b7912 100644 --- a/d3.time.min.js +++ b/d3.time.min.js @@ -1,10 +1,8 @@ -(function(){d3.time={};d3.time.format=function(a){function b(e){for(var d=[],h=-1,i=0,j,m;++h=j)return-1;d=b.charCodeAt(h++);if(d==37){d=k[b.charAt(h++)];if(!d||(e=d(a,c,e))<0)return-1}else if(d!=c.charCodeAt(e++))return-1}return e} -var l=d3.format("02d"),n=d3.format("03d"),o=d3.format("04d"),p=d3.format(" 2d"),f={a:function(a){return q[a.getDay()].substring(0,3)},A:function(a){return q[a.getDay()]},b:function(a){return r[a.getMonth()].substring(0,3)},B:function(a){return r[a.getMonth()]},c:d3.time.format("%a %b %e %H:%M:%S %Y"),d:function(a){return l(a.getDate())},e:function(a){return p(a.getDate())},H:function(a){return l(a.getHours())},I:function(a){return l(a.getHours()%12||12)},j:s,m:function(a){return l(a.getMonth()+1)}, -M:function(a){return l(a.getMinutes())},p:function(a){return a.getHours()>=12?"PM":"AM"},S:function(a){return l(a.getSeconds())},U:t,w:function(a){return a.getDay()},W:u,x:d3.time.format("%m/%d/%y"),X:d3.time.format("%H:%M:%S"),y:function(a){return l(a.getYear()%100)},Y:function(a){return o(a.getFullYear()%1E4)},Z:v,"%":function(){return"%"}},k={a:w,A:x,b:y,B:z,c:A,d:B,e:B,H:C,I:D,m:E,M:F,p:G,S:H,x:I,X:J,y:K,Y:L};function w(a,b,c){return b.substring(c,c+=3).toLowerCase()in M?c:-1} -var M={sun:3,mon:3,tue:3,wed:3,thu:3,fri:3,sat:3};function x(a,b,c){N.lastIndex=0;return(a=N.exec(b.substring(c,c+10)))?c+a[0].length:-1}var N=/^(?:Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday)/ig,q=["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"];function y(a,b,c){b=O[b.substring(c,c+=3).toLowerCase()];return b==null?-1:(a.setMonth(b),c)}var O={jan:0,feb:1,mar:2,apr:3,may:4,jun:5,jul:6,aug:7,sep:8,oct:9,nov:10,dec:11}; -function z(a,b,c){P.lastIndex=0;return(b=P.exec(b.substring(c,c+12)))?(a.setMonth(Q[b[0].toLowerCase()]),c+b[0].length):-1}var P=/^(?:January|February|March|April|May|June|July|August|September|October|November|December)/ig,Q={january:0,february:1,march:2,april:3,may:4,june:5,july:6,august:7,september:8,october:9,november:10,december:11},r=["January","February","March","April","May","June","July","August","September","October","November","December"]; -function A(a,b,c){return g(a,f.o.toString(),b,c)}function I(a,b,c){return g(a,f.x.toString(),b,c)}function J(a,b,c){return g(a,f.n.toString(),b,c)}function L(a,b,c){R.lastIndex=0;return(b=R.exec(b.substring(c,c+4)))?(a.setFullYear(b[0]),c+b[0].length):-1}function K(a,b,c){S.lastIndex=0;return(b=S.exec(b.substring(c,c+2)))?(a.setFullYear(~~((new Date).getFullYear()/1E3)*1E3+ +b[0]),c+b[0].length):-1} -function E(a,b,c){S.lastIndex=0;return(b=S.exec(b.substring(c,c+2)))?(a.setMonth(b[0]-1),c+b[0].length):-1}function B(a,b,c){S.lastIndex=0;return(b=S.exec(b.substring(c,c+2)))?(a.setDate(+b[0]),c+b[0].length):-1}function C(a,b,c){S.lastIndex=0;return(b=S.exec(b.substring(c,c+2)))?(a.setHours(+b[0]),c+b[0].length):-1}function D(a,b,c){a.i=true;return C(a,b,c)}function F(a,b,c){S.lastIndex=0;return(b=S.exec(b.substring(c,c+2)))?(a.setMinutes(+b[0]),c+b[0].length):-1} -function H(a,b,c){S.lastIndex=0;return(b=S.exec(b.substring(c,c+2)))?(a.setSeconds(+b[0]),c+b[0].length):-1}var S=/[\s\d]{1,2}/,R=/[\s\d]{1,4}/;function G(a,b,c){b=T[b.substring(c,c+=2).toLowerCase()];return b==null?-1:(a.k=b,c)}var T={am:0,pm:1};function s(a){return n(1+~~((a-new Date(a.getFullYear(),0,1))/864E5))}function t(a){var b=new Date(a.getFullYear(),0,1);return l(~~(((a-b)/864E5+b.getDay())/7))} -function u(a){var b=new Date(a.getFullYear(),0,1);return l(~~(((a-b)/864E5+(b.getDay()+6)%7)/7))}function v(a){a=a.getTimezoneOffset();var b=Math.abs(a)%60;return(a>0?"-":"+")+l(~~(Math.abs(a)/60))+l(b)};})() +(function(){function j(a,b,c,e){for(var d,h=0,i=b.length,k=c.length;h=k)return-1;d=b.charCodeAt(h++);if(d==37){d=u[b.charAt(h++)];if(!d||(e=d(a,c,e))<0)return-1}else if(d!=c.charCodeAt(e++))return-1}return e}function m(a,b,c){f.lastIndex=0;return(b=f.exec(b.substring(c,c+2)))?(a.setDate(+b[0]),c+b[0].length):-1}function n(a,b,c){f.lastIndex=0;return(b=f.exec(b.substring(c,c+2)))?(a.setHours(+b[0]),c+b[0].length):-1}d3.time={};d3.time.format=function(a){function b(e){for(var d=[],h=-1,i= +0,k,o;++h= +12?"PM":"AM"},S:function(a){return g(a.getSeconds())},U:function(a){var b=new Date(a.getFullYear(),0,1);return g(~~(((a-b)/864E5+b.getDay())/7))},w:function(a){return a.getDay()},W:function(a){var b=new Date(a.getFullYear(),0,1);return g(~~(((a-b)/864E5+(b.getDay()+6)%7)/7))},x:d3.time.format("%m/%d/%y"),X:d3.time.format("%H:%M:%S"),y:function(a){return g(a.getYear()%100)},Y:function(a){return w(a.getFullYear()%1E4)},Z:function(a){a=a.getTimezoneOffset();var b=Math.abs(a)%60;return(a>0?"-":"+")+g(~~(Math.abs(a)/ +60))+g(b)},"%":function(){return"%"}},u={a:function(a,b,c){return b.substring(c,c+=3).toLowerCase()in y?c:-1},A:function(a,b,c){r.lastIndex=0;return(a=r.exec(b.substring(c,c+10)))?c+a[0].length:-1},b:function(a,b,c){b=z[b.substring(c,c+=3).toLowerCase()];return b==null?-1:(a.setMonth(b),c)},B:function(a,b,c){s.lastIndex=0;return(b=s.exec(b.substring(c,c+12)))?(a.setMonth(A[b[0].toLowerCase()]),c+b[0].length):-1},c:function(a,b,c){return j(a,l.c.toString(),b,c)},d:m,e:m,H:n,I:function(a,b,c){a.hour12= +true;return n(a,b,c)},m:function(a,b,c){f.lastIndex=0;return(b=f.exec(b.substring(c,c+2)))?(a.setMonth(b[0]-1),c+b[0].length):-1},M:function(a,b,c){f.lastIndex=0;return(b=f.exec(b.substring(c,c+2)))?(a.setMinutes(+b[0]),c+b[0].length):-1},p:function(a,b,c){b=B[b.substring(c,c+=2).toLowerCase()];return b==null?-1:(a.hour12pm=b,c)},S:function(a,b,c){f.lastIndex=0;return(b=f.exec(b.substring(c,c+2)))?(a.setSeconds(+b[0]),c+b[0].length):-1},x:function(a,b,c){return j(a,l.x.toString(),b,c)},X:function(a, +b,c){return j(a,l.X.toString(),b,c)},y:function(a,b,c){f.lastIndex=0;return(b=f.exec(b.substring(c,c+2)))?(a.setFullYear(~~((new Date).getFullYear()/1E3)*1E3+ +b[0]),c+b[0].length):-1},Y:function(a,b,c){t.lastIndex=0;return(b=t.exec(b.substring(c,c+4)))?(a.setFullYear(b[0]),c+b[0].length):-1}},y={sun:3,mon:3,tue:3,wed:3,thu:3,fri:3,sat:3},r=/^(?:Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday)/ig,p=["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],z={jan:0,feb:1,mar:2, +apr:3,may:4,jun:5,jul:6,aug:7,sep:8,oct:9,nov:10,dec:11},s=/^(?:January|February|March|April|May|June|July|August|September|October|November|December)/ig,A={january:0,february:1,march:2,april:3,may:4,june:5,july:6,august:7,september:8,october:9,november:10,december:11},q=["January","February","March","April","May","June","July","August","September","October","November","December"],f=/[\s\d]{1,2}/,t=/[\s\d]{1,4}/,B={am:0,pm:1}})(); diff --git a/examples/albers/albers.html b/examples/albers/albers.html index 21e664930b18e..89f2f960b47bf 100644 --- a/examples/albers/albers.html +++ b/examples/albers/albers.html @@ -3,8 +3,8 @@ Albers Projection - - + +