Fix externs. Fix reentrant events.

This commit is contained in:
Michael Bostock 2010-11-18 17:33:56 -08:00
Родитель 35ec68a74e
Коммит 9761e25a4a
5 изменённых файлов: 11 добавлений и 8 удалений

5
d3.js поставляемый
Просмотреть файл

@ -1,4 +1,4 @@
d3 = {version: "0.19.0"}; // semver
d3 = {version: "0.19.1"}; // semver
if (!Date.now) Date.now = function() {
return +new Date();
};
@ -1192,11 +1192,12 @@ function d3_selection(groups) {
type = "on" + type;
return groups.each(function(d, i) {
this[type] = function(e) {
var o = d3.event; // Events can be reentrant (e.g., focus).
d3.event = e;
try {
listener.call(this, d, i);
} finally {
d3.event = null;
d3.event = o;
}
};
});

6
d3.min.js поставляемый
Просмотреть файл

@ -1,4 +1,4 @@
(function(){var o=null;d3={version:"0.19.0"};if(!Date.now)Date.now=function(){return+new Date};if(!Object.create)Object.create=function(a){function d(){}d.prototype=a;return new d};function w(a){return Array.prototype.slice.call(a)}function D(a,d){d=w(arguments);d[0]=this;a.apply(this,d);return this}d3.range=function(a,d,e){if(arguments.length==1){d=a;a=0}if(e==o)e=1;if((d-a)/e==Infinity)throw Error("infinite range");var f=[],b=-1,c;if(e<0)for(;(c=a+e*++b)>d;)f.push(c);else for(;(c=a+e*++b)<d;)f.push(c);return f};
(function(){var o=null;d3={version:"0.19.1"};if(!Date.now)Date.now=function(){return+new Date};if(!Object.create)Object.create=function(a){function d(){}d.prototype=a;return new d};function w(a){return Array.prototype.slice.call(a)}function D(a,d){d=w(arguments);d[0]=this;a.apply(this,d);return this}d3.range=function(a,d,e){if(arguments.length==1){d=a;a=0}if(e==o)e=1;if((d-a)/e==Infinity)throw Error("infinite range");var f=[],b=-1,c;if(e<0)for(;(c=a+e*++b)>d;)f.push(c);else for(;(c=a+e*++b)<d;)f.push(c);return f};
d3.text=function(a,d,e){var f=new XMLHttpRequest;if(arguments.length==3)f.overrideMimeType(d);else e=d;f.open("GET",a,true);f.onreadystatechange=function(){if(f.readyState==4)e(f.status<300&&f.responseText?f.responseText:o)};f.send(o)};d3.json=function(a,d){return d3.text(a,"application/json",function(e){d(e&&JSON.parse(e))})};
d3.ns={prefix:{svg:"http://www.w3.org/2000/svg",xhtml:"http://www.w3.org/1999/xhtml",xlink:"http://www.w3.org/1999/xlink",xml:"http://www.w3.org/XML/1998/namespace",xmlns:"http://www.w3.org/2000/xmlns/"},qualify:function(a){var d=a.indexOf(":");return d<0?a:{space:d3.ns.prefix[a.substring(0,d)],local:a.substring(d+1)}}};d3.dispatch=function(){for(var a={},d,e=0,f=arguments.length;e<f;e++){d=arguments[e];a[d]=E(d)}return a};
function E(){var a={},d=[];a.add=function(e){for(var f=0;f<d.length;f++)if(d[f].d==e)return a;d.push({d:e,on:true});return a};a.remove=function(e){for(var f=0;f<d.length;f++){var b=d[f];if(b.d==e){b.on=false;d=d.slice(0,f).concat(d.slice(f+1));break}}return a};a.dispatch=function(){for(var e=d,f=0,b=e.length;f<b;f++){var c=e[f];c.on&&c.d.apply(this,arguments)}};return a}
@ -31,7 +31,7 @@ this.removeAttributeNS(b.space,b.local):this.setAttributeNS(b.space,b.local,r)}b
m,h)}if(arguments.length<3)h=o;if(arguments.length<2)return f(function(){return window.getComputedStyle(this,o).getPropertyValue(b)});return a.each(c==o?g:typeof c=="function"?j:i)};a.property=function(b,c){function h(){delete this[b]}function g(){this[b]=c}function i(){var j=c.apply(this,arguments);if(j==o)delete this[b];else this[b]=j}b=d3.ns.qualify(b);if(arguments.length<2)return f(function(){return this[b]});return a.each(c==o?h:typeof c=="function"?i:g)};a.text=function(b){function c(){this.appendChild(document.createTextNode(b))}
function h(){var g=b.apply(this,arguments);g!=o&&this.appendChild(document.createTextNode(g))}if(arguments.length<1)return f(function(){return this.textContent});a.each(function(){for(;this.lastChild;)this.removeChild(this.lastChild)});return b==o?a:a.each(typeof b=="function"?h:c)};a.html=function(b){function c(){this.innerHTML=b}function h(){this.innerHTML=b.apply(this,arguments)}if(arguments.length<1)return f(function(){return this.innerHTML});return a.each(typeof b=="function"?h:c)};a.append=
function(b){function c(g){return g.appendChild(document.createElement(b))}function h(g){return g.appendChild(document.createElementNS(b.space,b.local))}b=d3.ns.qualify(b);return d(b.local?h:c)};a.remove=function(){return d(function(b){var c=b.parentNode;c.removeChild(b);return c})};a.sort=function(b){b=ra.apply(this,arguments);for(var c=0,h=a.length;c<h;c++){var g=a[c];g.sort(b);for(var i=1,j=g.length,m=g[0];i<j;i++){var p=g[i];if(p){m&&m.parentNode.insertBefore(p,m.nextSibling);m=p}}}return a};a.on=
function(b,c){b="on"+b;return a.each(function(h,g){this[b]=function(i){d3.event=i;try{c.call(this,h,g)}finally{d3.event=o}}})};a.transition=function(){return U(a)};a.call=D;return a}function qa(a){return{nodeKey:function(d){return d.getAttribute(a)},dataKey:function(d){return d[a]}}}function ra(a){arguments.length||(a=sa);return function(d,e){return a(d&&d.__data__,e&&e.__data__)}}function sa(a,d){return a<d?-1:a>d?1:0}d3.transition=T.transition;var ta=0,V=0;
function(b,c){b="on"+b;return a.each(function(h,g){this[b]=function(i){var j=d3.event;d3.event=i;try{c.call(this,h,g)}finally{d3.event=j}}})};a.transition=function(){return U(a)};a.call=D;return a}function qa(a){return{nodeKey:function(d){return d.getAttribute(a)},dataKey:function(d){return d[a]}}}function ra(a){arguments.length||(a=sa);return function(d,e){return a(d&&d.__data__,e&&e.__data__)}}function sa(a,d){return a<d?-1:a>d?1:0}d3.transition=T.transition;var ta=0,V=0;
function U(a){function d(k){var n=true,q=-1;a.each(function(){if(i[++q]!=2){var l=(k-j[q])/m[q],s=this.__transition__,t,u=c[q];if(l<1){n=false;if(!(l<0)){if(i[q]){if(s.c!=f){i[q]=2;return}}else if(!s||s.c>f){i[q]=2;return}else{i[q]=1;g.start.dispatch.apply(this,arguments);u=c[q]={};s.c=f;for(t in b)u[t]=b[t].apply(this,arguments)}s=r(l);for(t in b)u[t].call(this,s)}}else{i[q]=2;if(s.c==f){l=s.k;for(t in b)u[t].call(this,1);if(l==f){delete this.__transition__;h&&this.parentNode.removeChild(this)}V=
f;g.end.dispatch.apply(this,arguments);V=0;s.k=l}}}});return n}var e={},f=V||++ta,b={},c=[],h=false,g=d3.dispatch("start","end"),i=[],j=[],m=[],p,r=d3.ease("cubic-in-out");a.each(function(){(this.__transition__||(this.__transition__={})).k=f});e.delay=function(k){var n=Infinity,q=-1;if(typeof k=="function")a.each(function(){var l=j[++q]=+k.apply(this,arguments);if(l<n)n=l});else{n=+k;a.each(function(){j[++q]=n})}ua(d,n);return e};e.duration=function(k){var n=-1;if(typeof k=="function"){p=0;a.each(function(){var q=
m[++n]=+k.apply(this,arguments);if(q>p)p=q})}else{p=+k;a.each(function(){m[++n]=p})}return e};e.ease=function(k){r=typeof k=="string"?d3.ease(k):k;return e};e.attrTween=function(k,n){function q(s,t){var u=n.call(this,s,t,this.getAttribute(k));return function(A){this.setAttribute(k,u(A))}}function l(s,t){var u=n.call(this,s,t,this.getAttributeNS(k.space,k.local));return function(A){this.setAttributeNS(k.space,k.local,u(A))}}b["attr."+k]=k.local?l:q;return e};e.attr=function(k,n){return e.attrTween(k,
@ -45,7 +45,7 @@ b);g.push(d(c))}return g};e.tickFormat=function(){return function(b){return b.to
d3.scale.pow=function(){function a(h){return Math.pow(h,b)}function d(h){return Math.pow(h,c)}function e(h){return f(a(h))}var f=d3.scale.linear(),b=1,c=1/b;e.invert=function(h){return d(f.invert(h))};e.domain=function(h){if(!arguments.length)return f.domain().map(d);f.domain(h.map(a));return e};e.range=function(){var h=f.range.apply(f,arguments);return arguments.length?e:h};e.exponent=function(h){if(!arguments.length)return b;var g=e.domain();b=h;c=1/h;return e.domain(g)};return e};
d3.scale.sqrt=function(){return d3.scale.pow().exponent(0.5)};
d3.scale.ordinal=function(){function a(c){c=c in e?e[c]:e[c]=d.push(c)-1;return f[c%f.length]}var d=[],e={},f=[],b=0;a.domain=function(c){if(!arguments.length)return d;d=c;e={};for(var h=-1,g=-1,i=d.length;++h<i;){c=d[h];c in e||(e[c]=++g)}return a};a.range=function(c){if(!arguments.length)return f;f=c;return a};a.rangePoints=function(c,h){if(arguments.length<2)h=0;var g=c[0],i=c[1],j=(i-g)/(d.length-1+h);f=d.length==1?[(g+i)/2]:d3.range(g+j*h/2,i+j/2,j);b=0;return a};a.rangeBands=function(c,h){if(arguments.length<
2)h=0;var g=c[0],i=c[1],j=(i-g)/(d.length+h);f=d3.range(g+j*h,i,j);b=j*(1-h);return a};a.rangeBand=function(){return b};return a};d3.scale.category10=function(){return d3.scale.ordinal().range(xa)};d3.scale.category20=function(){return d3.scale.ordinal().range(ya)};d3.scale.o=function(){return d3.scale.ordinal().range(za)};d3.scale.p=function(){return d3.scale.ordinal().range(Aa)};
2)h=0;var g=c[0],i=c[1],j=(i-g)/(d.length+h);f=d3.range(g+j*h,i,j);b=j*(1-h);return a};a.rangeBand=function(){return b};return a};d3.scale.category10=function(){return d3.scale.ordinal().range(xa)};d3.scale.category20=function(){return d3.scale.ordinal().range(ya)};d3.scale.category20b=function(){return d3.scale.ordinal().range(za)};d3.scale.category20c=function(){return d3.scale.ordinal().range(Aa)};
var xa=["#1f77b4","#ff7f0e","#2ca02c","#d62728","#9467bd","#8c564b","#e377c2","#7f7f7f","#bcbd22","#17becf"],ya=["#1f77b4","#aec7e8","#ff7f0e","#ffbb78","#2ca02c","#98df8a","#d62728","#ff9896","#9467bd","#c5b0d5","#8c564b","#c49c94","#e377c2","#f7b6d2","#7f7f7f","#c7c7c7","#bcbd22","#dbdb8d","#17becf","#9edae5"],za=["#393b79","#5254a3","#6b6ecf","#9c9ede","#637939","#8ca252","#b5cf6b","#cedb9c","#8c6d31","#bd9e39","#e7ba52","#e7cb94","#843c39","#ad494a","#d6616b","#e7969c","#7b4173","#a55194","#ce6dbd",
"#de9ed6"],Aa=["#3182bd","#6baed6","#9ecae1","#c6dbef","#e6550d","#fd8d3c","#fdae6b","#fdd0a2","#31a354","#74c476","#a1d99b","#c7e9c0","#756bb1","#9e9ac8","#bcbddc","#dadaeb","#636363","#969696","#bdbdbd","#d9d9d9"];d3.svg={};
d3.svg.arc=function(){function a(c){return c.endAngle}function d(c){return c.startAngle}function e(c){return c.outerRadius}function f(c){return c.innerRadius}function b(c){var h=f(c),g=e(c),i=d(c)-Math.PI/2,j=a(c)-Math.PI/2;c=j-i;var m=Math.cos(i);i=Math.sin(i);var p=Math.cos(j);j=Math.sin(j);return"M"+g*m+","+g*i+"A"+g+","+g+" 0 "+(c<Math.PI?"0":"1")+",1 "+g*p+","+g*j+"L"+h*p+","+h*j+"A"+h+","+h+" 0 "+(c<Math.PI?"0":"1")+",0 "+h*m+","+h*i+"Z"}b.innerRadius=function(c){f=typeof c=="function"?c:function(){return c};

Просмотреть файл

@ -1 +1 @@
d3 = {version: "0.19.0"}; // semver
d3 = {version: "0.19.1"}; // semver

Просмотреть файл

@ -458,11 +458,12 @@ function d3_selection(groups) {
type = "on" + type;
return groups.each(function(d, i) {
this[type] = function(e) {
var o = d3.event; // Events can be reentrant (e.g., focus).
d3.event = e;
try {
listener.call(this, d, i);
} finally {
d3.event = null;
d3.event = o;
}
};
});

Просмотреть файл

@ -81,8 +81,9 @@ var d3 = {
// d3.scale
d3.scale = {
category10: 1,
category19: 1,
category20: 1,
category20b: 1,
category20c: 1,
domain: 1,
invert: 1,
linear: 1,