diff --git a/nv.d3.js b/nv.d3.js
index d6780ca..d8f3899 100644
--- a/nv.d3.js
+++ b/nv.d3.js
@@ -1229,6 +1229,7 @@ nv.models.line = function() {
       clearTimeout(timeoutID);
       timeoutID = setTimeout(updateInteractiveLayer, 750);
 
+      //store old scales for use in transitions on update, to animate from old to new positions
       x0 = x.copy();
       y0 = y.copy();
 
@@ -2490,7 +2491,7 @@ nv.models.scatter = function() {
           return false;
         }
 
-        gEnter.append('g').attr('class', 'point-clips').append('clipPath').attr('id', 'points-clip-' + id);
+        defsEnter.append('clipPath').attr('id', 'points-clip-' + id);
         gEnter.append('g').attr('class', 'point-paths');
 
         var vertices = d3.merge(data.map(function(group, groupIndex) {
@@ -2654,7 +2655,7 @@ nv.models.scatter = function() {
       clearTimeout(timeoutID);
       timeoutID = setTimeout(updateInteractiveLayer, 750);
 
-      //store old scales for use in transitions on update
+      //store old scales for use in transitions on update, to animate from old to new positions, and sizes
       x0 = x.copy();
       y0 = y.copy();
       z0 = z.copy();
diff --git a/nv.d3.min.js b/nv.d3.min.js
index 3fee12c..afed1ed 100644
--- a/nv.d3.min.js
+++ b/nv.d3.min.js
@@ -1,2 +1,2 @@
 (function(){function b(a,b){var c=[31,28,31,30,31,30,31,31,30,31,30,31];return a!=2?c[a-1]:b%4!=0?c[1]:b%100==0&&b%400!=0?c[1]:c[1]+1}function c(a,b,c){return function(d,e,f){var g=a(d),h=[];g<d&&b(g);if(f>1)while(g<e){var i=new Date(+g);c(i)%f||h.push(i),b(g)}else while(g<e)h.push(new Date(+g)),b(g);return h}}var a={version:"0.0.1a",dev:!0};window.nv=a,a.tooltip={},a.utils={},a.models={},a.charts={},a.graphs=[],a.log={},a.dispatch=d3.dispatch("render_start","render_end"),a.dispatch.on("render_start",function(b){a.log.startTime=+(new Date)}),a.dispatch.on("render_end",function(b){a.log.endTime=+(new Date),a.log.totalTime=a.log.endTime-a.log.startTime,a.dev&&console.log&&console.log("total",a.log.totalTime)}),a.render=function d(b){b=b||1,d.active=!0,a.dispatch.render_start(),setTimeout(function(){var c;for(var e=0;e<b&&(graph=d.queue[e]);e++)c=graph.generate(),typeof graph.callback=="function"&&graph.callback(c),a.graphs.push(c);d.queue.splice(0,e),d.queue.length?setTimeout(arguments.callee,0):(a.render.active=!1,a.dispatch.render_end())},0)},a.render.queue=[],a.addGraph=function(b){typeof arguments[0]=="function"&&(b={generate:arguments[0],callback:arguments[1]}),a.render.queue.push(b),a.render.active||a.render()},a.identity=function(a){return a},a.strip=function(a){return a.replace(/(\s|&)/g,"")},d3.time.monthEnd=function(a){return new Date(a.getFullYear(),a.getMonth(),0)},d3.time.monthEnds=c(d3.time.monthEnd,function(a){a.setUTCDate(a.getUTCDate()+1),a.setDate(b(a.getMonth()+1,a.getFullYear()))},function(a){return a.getMonth()}),function(){var b=window.nv.tooltip={};b.show=function(b,c,d,e){var f=document.createElement("div");f.className="nvtooltip",d=d||"s",e=e||20;var g=document.getElementsByTagName("body")[0];f.innerHTML=c,f.style.left=1,f.style.top=1,f.style.opacity=0,g.appendChild(f);var h=parseInt(f.offsetHeight),i=parseInt(f.offsetWidth),j=a.utils.windowSize().width,k=a.utils.windowSize().height,l=g.scrollTop,m=g.scrollLeft,n,o;switch(d){case"e":n=b[0]-i-e,o=b[1]-h/2,n<m&&(n=b[0]+e),o<l&&(o=l+5),o+h>l+k&&(o=l-h-5);break;case"w":n=b[0]+e,o=b[1]-h/2,n+i>j&&(n=b[0]-i-e),o<l&&(o=l+5),o+h>l+k&&(o=l-h-5);break;case"n":n=b[0]-i/2,o=b[1]+e,n<m&&(n=m+5),n+i>j&&(n=j-i-5),o+h>l+k&&(o=b[1]-h-e);break;case"s":n=b[0]-i/2,o=b[1]-h-e,n<m&&(n=m+5),n+i>j&&(n=j-i-5),l>o&&(o=b[1]+20)}return f.style.left=n+"px",f.style.top=o+"px",f.style.opacity=1,f},b.cleanup=function(){var a=document.getElementsByClassName("nvtooltip"),b=[];while(a.length)b.push(a[0]),a[0].style.transitionDelay="0 !important",a[0].style.opacity=0,a[0].className="nvtooltip-pending-removal";setTimeout(function(){while(b.length){var a=b.pop();a.parentNode.removeChild(a)}},500)}}(),a.utils.windowSize=function(){var a={width:640,height:480};return document.body&&document.body.offsetWidth&&(a.width=document.body.offsetWidth,a.height=document.body.offsetHeight),document.compatMode=="CSS1Compat"&&document.documentElement&&document.documentElement.offsetWidth&&(a.width=document.documentElement.offsetWidth,a.height=document.documentElement.offsetHeight),window.innerWidth&&window.innerHeight&&(a.width=window.innerWidth,a.height=window.innerHeight),a},a.models.axis=function(){function g(h){return h.each(function(g){e.domain(a).range(b),f.orient(c);var h=d3.select(this).selectAll("text.axislabel").data([d||null]);switch(c){case"top":h.enter().append("text").attr("class","axislabel").attr("text-anchor","middle").attr("y",0),h.attr("x",b[1]/2);break;case"right":h.enter().append("text").attr("class","axislabel").attr("transform","rotate(90)").attr("y",-40),h.attr("x",-b[0]/2);break;case"bottom":h.enter().append("text").attr("class","axislabel").attr("text-anchor","middle").attr("y",25),h.attr("x",b[1]/2);break;case"left":h.enter().append("text").attr("class","axislabel").attr("transform","rotate(-90)").attr("y",-40),h.attr("x",-b[0]/2)}h.exit().remove(),h.text(function(a){return a}),d3.transition(d3.select(this)).call(f),d3.select(this).selectAll("line.tick").filter(function(a){return!parseFloat(Math.round(a*1e5)/1e6)}).classed("zero",!0)}),g}var a=[0,1],b=[0,1],c="bottom",d=!1,e=d3.scale.linear(),f=d3.svg.axis().scale(e);return g.orient=function(a){return arguments.length?(c=a,g):c},g.domain=function(b){return arguments.length?(a=b,g):a},g.range=function(a){return arguments.length?(b=a,g):b},g.scale=function(a){return arguments.length?(e=a,f.scale(e),g):e},g.axisLabel=function(a){return arguments.length?(d=a,g):d},d3.rebind(g,f,"ticks","tickSubdivide","tickSize","tickPadding","tickFormat"),g},a.models.bar=function(){function q(r){return r.each(function(q){l.domain(q.map(function(a,b){return a[e]})).rangeRoundBands([0,b-a.left-a.right],.1);var r=d3.min(q,function(a){return a[j]}),s=d3.max(q,function(a){return a[j]}),t=Math.max(-r,s),u=-t;r>=0&&(u=0),m.domain([u,t]).range([c-a.top-a.bottom,0]).nice(),n.ticks(b/100),o.ticks(c/36).tickSize(-(b-a.right-a.left),0);var v=d3.select(this).on("click",function(a,b){p.chartClick({data:a,index:b,pos:d3.event,id:h})}),w=v.selectAll("g.wrap").data([q]),z=w.enter();z.append("text").attr("class","title").attr("dy",".91em").attr("text-anchor","start").text(k),z=z.append("g").attr("class","wrap").attr("id","wrap-"+h).append("g"),z.append("g").attr("class","x axis"),z.append("g").attr("class","y axis"),z.append("g").attr("class","bars"),w.attr("width",b).attr("height",c);var A=w.select("g").attr("transform","translate("+a.left+","+a.top+")"),B=w.select(".bars").selectAll(".bar").data(function(a){return a});B.exit().remove();var C=B.enter().append("svg:rect").attr("class",function(a){return a[j]<0?"bar negative":"bar positive"}).attr("fill",function(a,b){return i(b)}).attr("x",0).on("mouseover",function(a,b){d3.select(this).classed("hover",!0),p.tooltipShow({label:a[e],value:a[j],data:a,index:b,pos:[d3.event.pageX,d3.event.pageY],id:h})}).on("mouseout",function(a,b){d3.select(this).classed("hover",!1),p.tooltipHide({label:a[e],value:a[j],data:a,index:b,id:h})}).on("click",function(a,b){p.elementClick({label:a[e],value:a[j],data:a,index:b,pos:d3.event,id:h}),d3.event.stopPropagation()}).on("dblclick",function(a,b){p.elementDblClick({label:a[e],value:a[j],data:a,index:b,pos:d3.event,id:h}),d3.event.stopPropagation()});B.attr("class",function(a){return a[j]<0?"bar negative":"bar positive"}).attr("transform",function(a,b){return"translate("+l(a[e])+",0)"}).attr("width",l.rangeBand).order().transition().duration(d).attr("y",function(a){return m(Math.max(0,a[j]))}).attr("height",function(a){return Math.abs(m(a[j])-m(0))}),A.select(".x.axis").attr("transform","translate(0,"+m.range()[0]+")").call(n),f&&A.select(".x.axis").selectAll("text").attr("text-anchor","start").attr("transform",function(a){return"rotate(35)translate("+this.getBBox().height/2+","+"0"+")"}),g||(A.select(".x.axis").selectAll("text").attr("fill","rgba(0,0,0,0)"),A.select(".x.axis").selectAll("line").attr("style","opacity: 0")),A.select(".y.axis").call(o)}),q}var a={top:20,right:10,bottom:80,left:60},b=960,c=500,d=500,e="label",f=!0,g=!0,h=Math.floor(Math.random()*1e4),i=d3.scale.category20(),j="y",k="",l=d3.scale.ordinal(),m=d3.scale.linear(),n=d3.svg.axis().scale(l).orient("bottom"),o=d3.svg.axis().scale(m).orient("left"),p=d3.dispatch("chartClick","elementClick","elementDblClick","tooltipShow","tooltipHide");return q.margin=function(b){return arguments.length?(a=b,q):a},q.width=function(c){return arguments.length?(a.left+a.right+20>c?b=a.left+a.right+20:b=c,q):b},q.height=function(b){return arguments.length?(a.top+a.bottom+20>b?c=a.top+a.bottom+20:c=b,q):c},q.animate=function(a){return arguments.length?(d=a,q):d},q.labelField=function(a){return arguments.length?(e=a,q):e},q.dataField=function(a){return arguments.length?(j=a,q):j},q.id=function(a){return arguments.length?(h=a,q):h},q.rotatedLabel=function(a){return arguments.length?(f=a,q):f},q.showLabels=function(a){return arguments.length?(g=a,q):g},q.title=function(a){return arguments.length?(k=a,q):k},q.xaxis={},d3.rebind(q.xaxis,n,"tickFormat"),q.yaxis={},d3.rebind(q.yaxis,o,"tickFormat"),q.dispatch=p,q},a.models.cumulativeLine=function(){function t(a,b){}function u(a,b){a.x+=d3.event.dx,a.i=Math.round(k.invert(a.x)),d3.select(this).attr("transform","translate("+k(a.i)+",0)")}function v(a,b){d3.transition(d3.select(".chart-"+i)).call(w)}function w(a){return a.each(function(f){var g=c(),h=d(),t=g-b.left-b.right,u=h-b.top-b.bottom,v=x(r.i,f),z=v.filter(function(a){return!a.disabled}).map(function(a){return a.values});j.domain(d3.extent(d3.merge(z),function(a){return a.x})).range([0,g-b.left-b.right]),k.domain([0,f[0].values.length-1]).range([0,g-b.left-b.right]).clamp(!0),l.domain(d3.extent(d3.merge(z),function(a){return a.y})).range([h-b.top-b.bottom,0]),p.width(g-b.left-b.right).height(h-b.top-b.bottom).color(f.map(function(a,b){return a.color||e[b%10]}).filter(function(a,b){return!f[b].disabled}));var A=d3.select(this).classed("chart-"+i,!0).selectAll("g.wrap").data([v]),B=A.enter().append("g").attr("class","wrap d3cumulativeLine").append("g");B.append("g").attr("class","x axis"),B.append("g").attr("class","y axis"),B.append("g").attr("class","linesWrap"),B.append("g").attr("class","legendWrap"),b.top=o.height();var C=A.select("g").attr("transform","translate("+b.left+","+b.top+")");o.width(g/2-b.right),C.select(".legendWrap").datum(f).attr("transform","translate("+(g/2-b.left)+","+ -b.top+")").call(o);var D=C.select(".linesWrap").datum(v.filter(function(a){return!a.disabled}));d3.transition(D).call(p);var E=D.selectAll(".indexLine").data([r]);E.enter().append("rect").attr("class","indexLine").attr("width",3).attr("x",-2).attr("fill","red").attr("fill-opacity",.5).call(s),E.attr("transform",function(a){return"translate("+k(a.i)+",0)"}).attr("height",h-b.top-b.bottom),m.domain(j.domain()).range(j.range()).ticks(g/100).tickSize(-(h-b.top-b.bottom),0),C.select(".x.axis").attr("transform","translate(0,"+l.range()[0]+")"),d3.transition(C.select(".x.axis")).call(m),n.domain(l.domain()).range(l.range()).ticks(h/36).tickSize(-(g-b.right-b.left),0),d3.transition(C.select(".y.axis")).call(n),o.dispatch.on("legendClick",function(b,c){b.disabled=!b.disabled,f.filter(function(a){return!a.disabled}).length||f.map(function(a){return a.disabled=!1,A.selectAll(".series").classed("disabled",!1),a}),a.transition().call(w)}),p.dispatch.on("pointMouseover.tooltip",function(a){q.tooltipShow({point:a.point,series:a.series,pos:[a.pos[0]+b.left,a.pos[1]+b.top],seriesIndex:a.seriesIndex,pointIndex:a.pointIndex})}),p.dispatch.on("pointMouseout.tooltip",function(a){q.tooltipHide(a)})}),w}function x(a,b){return b.map(function(b,c){var d=h(b.values[a],a);return{key:b.key,values:b.values.map(function(a,b){return{x:g(a,b),y:(h(a,b)-d)/(1+d)}}),disabled:b.disabled,hover:b.hover}})}var b={top:30,right:20,bottom:30,left:60},c=function(){return 960},d=function(){return 500},e=d3.scale.category10().range(),f=function(){return 2.5},g=function(a){return a.x},h=function(a){return a.y},i=Math.floor(Math.random()*1e4),j=d3.scale.linear(),k=d3.scale.linear(),l=d3.scale.linear(),m=a.models.axis().scale(j).orient("bottom"),n=a.models.axis().scale(l).orient("left"),o=a.models.legend().height(30),p=a.models.line(),q=d3.dispatch("tooltipShow","tooltipHide"),r={i:0,x:0},s=d3.behavior.drag().on("dragstart",t).on("drag",u).on("dragend",v);return w.dispatch=q,w.x=function(a){return arguments.length?(g=a,w):g},w.y=function(a){return arguments.length?(h=a,w):h},w.margin=function(a){return arguments.length?(b=a,w):b},w.width=function(a){return arguments.length?(c=d3.functor(a),w):c},w.height=function(a){return arguments.length?(d=d3.functor(a),w):d},w.dotRadius=function(a){return arguments.length?(f=d3.functor(a),p.dotRadius=a,w):f},w.xAxis=m,w.yAxis=n,w},a.models.legend=function(){function f(g){return g.each(function(f){var g=d3.select(this).selectAll("g.legend").data([f]),h=g.enter().append("g").attr("class","legend").append("g"),i=g.select("g").attr("transform","translate("+a.left+","+a.top+")"),j=i.selectAll(".series").data(function(a){return a}),k=j.enter().append("g").attr("class","series").on("mouseover",function(a,b){e.legendMouseover(a,b)}).on("mouseout",function(a,b){e.legendMouseout(a,b)}).on("click",function(a,b){e.legendClick(a,b)});k.append("circle").style("fill",function(a,b){return a.color||d[b%20]}).style("stroke",function(a,b){return a.color||d[b%20]}).style("stroke-width",2).attr("r",5),k.append("text").text(function(a){return a.key}).attr("text-anchor","start").attr("dy",".32em").attr("dx","8"),j.classed("disabled",function(a){return a.disabled}),j.exit().remove();var l=5,m=5,n=0,o;j.attr("transform",function(c,d){var e=d3.select(this).select("text").node().getComputedTextLength()+28;return o=m,b<a.left+a.right+o+e&&(m=o=5,l+=20),m+=e,m>n&&(n=m),"translate("+o+","+l+")"}),i.attr("transform","translate("+(b-a.right-n)+","+a.top+")"),c=a.top+a.bottom+l+15}),f}var a={top:5,right:0,bottom:5,left:10},b=400,c=20,d=d3.scale.category10().range(),e=d3.dispatch("legendClick","legendMouseover","legendMouseout");return f.dispatch=e,f.margin=function(b){return arguments.length?(a=b,f):a},f.width=function(a){return arguments.length?(b=a,f):b},f.height=function(a){return arguments.length?(c=a,f):c},f.color=function(a){return arguments.length?(d=a,f):d},f},a.models.line=function(){function v(w){return w.each(function(v){function F(){if(!k)return B.select("#points-clip-"+f).remove(),B.select(".point-paths").remove(),!1;E.append("g").attr("class","point-paths"),D.append("clipPath").attr("id","points-clip-"+f);var b=d3.merge(v.map(function(a,b){return a.values.map(function(a,c){return[p(g(a,c))*(Math.random()/1e12+1),q(h(a,c))*(Math.random()/1e12+1),b,c]})})),c=B.select("#points-clip-"+f).selectAll("circle").data(b);c.enter().append("circle").attr("r",25),c.exit().remove(),c.attr("cx",function(a){return a[0]}).attr("cy",function(a){return a[1]}),B.select(".point-paths").attr("clip-path",m?"url(#points-clip-"+f+")":null);var d=d3.geom.voronoi(b).map(function(a,c){return{data:a,series:b[c][2],point:b[c][3]}}),e=B.select(".point-paths").selectAll("path").data(d);e.enter().append("path").attr("class",function(a,b){return"path-"+b}),e.exit().remove(),e.attr("d",function(a){return"M"+a.data.join(",")+"Z"}).on("mouseover",function(b){var c=v[b.series],d=c.values[b.point];r.pointMouseover({point:d,series:c,pos:[p(g(d,b.point))+a.left,q(h(d,b.point))+a.top],seriesIndex:b.series,pointIndex:b.point})}).on("mouseout",function(a,b){r.pointMouseout({point:v[a.series].values[a.point],series:v[a.series],seriesIndex:a.series,pointIndex:a.point})}),r.on("pointMouseover.point",function(a){B.select(".series-"+a.seriesIndex+" .point-"+a.pointIndex).classed("hover",!0)}),r.on("pointMouseout.point",function(a){B.select(".series-"+a.seriesIndex+" .point-"+a.pointIndex).classed("hover",!1)})}var w=v.map(function(a){return a.values.map(function(a,b){return{x:g(a,b),y:h(a,b)}})}),z=b-a.left-a.right,A=c-a.top-a.bottom;s=s||p,t=t||q,p.domain(n||d3.extent(d3.merge(w).map(function(a){return a.x}).concat(i))).range([0,z]),q.domain(o||d3.extent(d3.merge(w).map(function(a){return a.y}).concat(j))).range([A,0]);var B=d3.select(this).selectAll("g.d3line").data([v]),C=B.enter().append("g").attr("class","d3line"),D=C.append("defs"),E=C.append("g");E.append("g").attr("class","lines"),B.attr("transform","translate("+a.left+","+a.top+")"),D.append("clipPath").attr("id","edge-clip-"+f).append("rect"),B.select("#edge-clip-"+f+" rect").attr("width",z).attr("height",A),E.attr("clip-path",l?"url(#edge-clip-"+f+")":null);var G=B.select(".lines").selectAll(".line").data(function(a){return a},function(a){return a.key});G.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),d3.transition(G.exit()).style("stroke-opacity",1e-6).style("fill-opacity",1e-6).remove(),G.attr("class",function(a,b){return"line series-"+b}).classed("hover",function(a){return a.hover}).style("fill",function(a,b){return e[b%10]}).style("stroke",function(a,b){return e[b%10]}),d3.transition(G).style("stroke-opacity",1).style("fill-opacity",.5);var H=G.selectAll("path").data(function(a,b){return[a.values]});H.enter().append("path").attr("d",d3.svg.line().x(function(a,b){return s(g(a,b))}).y(function(a,b){return t(h(a,b))})),d3.transition(G.exit().selectAll("path")).attr("d",d3.svg.line().x(function(a,b){return p(g(a,b))}).y(function(a,b){return q(h(a,b))})).remove(),d3.transition(H).attr("d",d3.svg.line().x(function(a,b){return p(g(a,b))}).y(function(a,b){return q(h(a,b))}));var I=G.selectAll("circle.point").data(function(a){return a.values});I.enter().append("circle").attr("cx",function(a,b){return s(g(a,b))}).attr("cy",function(a,b){return t(h(a,b))}),d3.transition(G.exit().selectAll("circle.point")).attr("cx",function(a,b){return p(g(a,b))}).attr("cy",function(a,b){return q(h(a,b))}).remove(),d3.transition(I).attr("class",function(a,b){return"point point-"+b}).attr("cx",function(a,b){return p(g(a,b))}).attr("cy",function(a,b){return q(h(a,b))}).attr("r",d),clearTimeout(u),u=setTimeout(F,750),s=p.copy(),t=q.copy()}),v}var a={top:0,right:0,bottom:0,left:0},b=960,c=500,d=function(){return 2.5},e=d3.scale.category10().range(),f=Math.floor(Math.random()*1e4),g=function(a){return a.x},h=function(a){return a.y},i=[],j=[],k=!0,l=!1,m=!0,n,o,p=d3.scale.linear(),q=d3.scale.linear(),r=d3.dispatch("pointMouseover","pointMouseout"),s,t,u;return v.dispatch=r,v.x=function(a){return arguments.length?(g=a,v):g},v.y=function(a){return arguments.length?(h=a,v):h},v.margin=function(b){return arguments.length?(a=b,v):a},v.width=function(a){return arguments.length?(b=a,v):b},v.height=function(a){return arguments.length?(c=a,v):c},v.xDomain=function(a){return arguments.length?(n=a,v):n},v.yDomain=function(a){return arguments.length?(o=a,v):o},v.forceX=function(a){return arguments.length?(i=a,v):i},v.forceY=function(a){return arguments.length?(j=a,v):j},v.interactive=function(a){return arguments.length?(k=a,v):k},v.clipEdge=function(a){return arguments.length?(l=a,v):l},v.clipVoronoi=function(a){return arguments.length?(m=a,v):m},v.dotRadius=function(a){return arguments.length?(d=d3.functor(a),v):d},v.color=function(a){return arguments.length?(e=a,v):e},v.id=function(a){return arguments.length?(f=a,v):f},v},a.models.linePlusBar=function(){function s(a){return a.each(function(e){var t=c(),u=d(),v=t-b.left-b.right,w=u-b.top-b.bottom,y=e.filter(function(a){return!a.disabled&&!a.bar}).map(function(a){return a.values.map(function(a,b){return{x:f(a,b),y:g(a,b)}})}),z=e.filter(function(a){return!a.disabled&&a.bar}).map(function(a){return a.values.map(function(a,b){return{x:f(a,b),y:g(a,b)}})});j.domain(d3.extent(d3.merge(y.concat(z)),function(a){return a.x})).range([0,v]),k.domain(d3.extent(d3.merge(y),function(a){return a.y})).range([w,0]),l.domain(d3.extent(d3.merge(z),function(a){return a.y})).range([w,0]),q.width(v).height(w).color(e.map(function(a,b){return a.color||h[b%10]}).filter(function(a,b){return!e[b].disabled&&!e[b].bar})),r.width(v).height(w).color(e.map(function(a,b){return a.color||h[b%10]}).filter(function(a,b){return!e[b].disabled&&e[b].bar}));var A=d3.select(this).selectAll("g.wrap").data([e]),B=A.enter().append("g").attr("class","wrap d3linePlusBar").append("g");B.append("g").attr("class","x axis"),B.append("g").attr("class","y1 axis"),B.append("g").attr("class","y2 axis"),B.append("g").attr("class","barsWrap"),B.append("g").attr("class","linesWrap"),B.append("g").attr("class","legendWrap"),p.dispatch.on("legendClick",function(b,c){b.disabled=!b.disabled,e.filter(function(a){return!a.disabled}).length||e.map(function(a){return a.disabled=!1,A.selectAll(".series").classed("disabled",!1),a}),a.transition().call(s)}),q.dispatch.on("pointMouseover.tooltip",function(a){i.tooltipShow({point:a.point,series:a.series,pos:[a.pos[0]+b.left,a.pos[1]+b.top],seriesIndex:a.seriesIndex,pointIndex:a.pointIndex})}),q.dispatch.on("pointMouseout.tooltip",function(a){i.tooltipHide(a)}),r.dispatch.on("elementMouseover.tooltip",function(a){i.tooltipShow({point:a.point,series:a.series,pos:[a.pos[0]+b.left,a.pos[1]+b.top],seriesIndex:a.seriesIndex,pointIndex:a.pointIndex})}),r.dispatch.on("elementMouseout.tooltip",function(a){i.tooltipHide(a)}),b.top=p.height();var C=A.select("g").attr("transform","translate("+b.left+","+b.top+")");p.width(t/2-b.right),C.select(".legendWrap").datum(e).attr("transform","translate("+(t/2-b.left)+","+ -b.top+")").call(p);var D=e.filter(function(a){return!a.disabled&&a.bar}),E=C.select(".barsWrap").datum(D.length?D:[{values:[]}]),F=C.select(".linesWrap").datum(e.filter(function(a){return!a.disabled&&!a.bar}));d3.transition(E).call(r),d3.transition(F).call(q),m.domain(j.domain()).range(j.range()).ticks(t/100).tickSize(-w,0),C.select(".x.axis").attr("transform","translate(0,"+k.range()[0]+")"),d3.transition(C.select(".x.axis")).call(m),n.domain(k.domain()).range(k.range()).ticks(u/36).tickSize(-v,0),d3.transition(C.select(".y1.axis")).call(n),o.domain(l.domain()).range(l.range()).ticks(u/36).tickSize(y.length?0:-v,0),C.select(".y2.axis").attr("transform","translate("+j.range()[1]+",0)"),d3.transition(C.select(".y2.axis")).call(o)}),s}var b={top:30,right:60,bottom:50,left:60},c=function(){return 960},d=function(){return 500},e=function(){return 2.5},f=function(a){return a.x},g=function(a){return a.y},h=d3.scale.category10().range(),i=d3.dispatch("tooltipShow","tooltipHide"),j=d3.scale.linear(),k=d3.scale.linear(),l=d3.scale.linear(),m=a.models.axis().scale(j).orient("bottom"),n=a.models.axis().scale(k).orient("left"),o=a.models.axis().scale(l).orient("right"),p=a.models.legend().height(30),q=a.models.line(),r=a.models.historicalBar();return s.dispatch=i,s.legend=p,s.lines=q,s.bars=r,s.xAxis=m,s.yAxis1=n,s.yAxis2=o,s.x=function(a){return arguments.length?(f=a,q.x(a),s):f},s.y=function(a){return arguments.length?(g=a,q.y(a),s):g},s.margin=function(a){return arguments.length?(b=a,s):b},s.width=function(a){return arguments.length?(c=d3.functor(a),s):c},s.height=function(a){return arguments.length?(d=d3.functor(a),s):d},s.dotRadius=function(a){return arguments.length?(e=d3.functor(a),q.dotRadius=a,s):e},s},a.models.lineWithFocus=function(){function z(a){return a.each(function(h){function G(){H(),D.call(v),l.select(".x.axis").call(q),l.select(".y.axis").call(r)}function H(){var a=y.empty()?p.domain():d3.extent(d3.merge(seriesData).filter(function(a){return j(a)>=y.extent()[0]&&j(a)<=y.extent()[1]}),k);typeof a[0]=="undefined"&&(a=p.domain()),m.domain(y.empty()?o.domain():y.extent()),n.domain(a),v.xDomain(m.domain()),v.yDomain(n.domain())}seriesData=h.filter(function(a){return!a.disabled}).map(function(a){return a.values}),o.domain(d3.extent(d3.merge(seriesData),j)).range([0,d-b.left-b.right]),p.domain(d3.extent(d3.merge(seriesData),k)).range([g-c.top-c.bottom,0]),m.domain(y.empty()?o.domain():y.extent()).range([0,d-b.left-b.right]),n.domain(p.domain()).range([f-b.top-b.bottom,0]),y.on("brush",G),v.width(d-b.left-b.right).height(f-b.top-b.bottom).color(h.map(function(a,b){return a.color||i[b%10]}).filter(function(a,b){return!h[b].disabled})),w.width(d-b.left-b.right).height(g-c.top-c.bottom).color(h.map(function(a,b){return a.color||i[b%10]}).filter(function(a,b){return!h[b].disabled})),H();var l=d3.select(this).selectAll("g.wrap").data([h]),A=l.enter().append("g").attr("class","wrap d3lineWithFocus").append("g");A.append("g").attr("class","focus"),A.append("g").attr("class","context"),A.append("g").attr("class","legendWrap");var B=l.select("g");u.width(d/2-b.right),B.select(".legendWrap").datum(h).attr("transform","translate("+(d/2-b.left)+",0)").call(u),b.top=u.height();var C=B.select(".focus").attr("transform","translate("+b.left+","+b.top+")");A.select(".focus").append("g").attr("class","x axis"),A.select(".focus").append("g").attr("class","y axis"),A.select(".focus").append("g").attr("class","focusLines");var D=C.select(".focusLines").datum(h.filter(function(a){return!a.disabled}));d3.transition(D).call(v),q.domain(m.domain()).range(m.range()).ticks(d/100).tickSize(-(f-b.top-b.bottom),0),C.select(".x.axis").attr("transform","translate(0,"+n.range()[0]+")"),d3.transition(B.select(".x.axis")).call(q),r.domain(n.domain()).range(n.range()).ticks(e/36).tickSize(-(d-b.right-b.left),0),d3.transition(B.select(".y.axis")).call(r);var E=B.select(".context").attr("transform","translate("+c.left+","+f+")");A.select(".context").append("g").attr("class","x2 axis"),A.select(".context").append("g").attr("class","y2 axis"),A.select(".context").append("g").attr("class","contextLines"),A.select(".context").append("g").attr("class","x brush").attr("class","x brush").call(y).selectAll("rect").attr("y",-5).attr("height",g+4);var F=E.select(".contextLines").datum(h.filter(function(a){return!a.disabled}));d3.transition(F).call(w),s.domain(o.domain()).range(o.range()).ticks(d/100).tickSize(-(g-c.top-c.bottom),0),E.select(".x2.axis").attr("transform","translate(0,"+p.range()[0]+")"),d3.transition(E.select(".x2.axis")).call(s),t.domain(p.domain()).range(p.range()).ticks((g-c.top-c.bottom)/24).tickSize(-(d-c.right-c.left),0),E.select(".y2.axis"),d3.transition(E.select(".y2.axis")).call(t),u.dispatch.on("legendClick",function(b,c){b.disabled=!b.disabled,h.filter(function(a){return!a.disabled}).length||h.map(function(a){return a.disabled=!1,l.selectAll(".series").classed("disabled",!1),a}),a.transition().call(z)}),v.dispatch.on("pointMouseover.tooltip",function(a){x.tooltipShow({point:a.point,series:a.series,pos:[a.pos[0]+b.left,a.pos[1]+b.top],seriesIndex:a.seriesIndex,pointIndex:a.pointIndex})}),v.dispatch.on("pointMouseout.tooltip",function(a){x.tooltipHide(a)})}),z}var b={top:30,right:20,bottom:30,left:60},c={top:0,right:20,bottom:20,left:60},d=960,e=500,f=400,g=100,h=function(){return 2.5},i=d3.scale.category10().range(),j=function(a){return a.x},k=function(a){return a.y},l=Math.floor(Math.random()*1e4),m=d3.scale.linear(),n=d3.scale.linear(),o=d3.scale.linear(),p=d3.scale.linear(),q=a.models.axis().scale(m).orient("bottom"),r=a.models.axis().scale(n).orient("left"),s=a.models.axis().scale(o).orient("bottom"),t=a.models.axis().scale(p).orient("left"),u=a.models.legend().height(30),v=a.models.line().clipEdge(!0),w=a.models.line().dotRadius(.1).interactive(!1),x=d3.dispatch("tooltipShow","tooltipHide"),y=d3.svg.brush().x(o);return z.dispatch=x,z.x=function(a){return arguments.length?(j=a,v.x(a),w.x(a),z):j},z.y=function(a){return arguments.length?(k=a,v.y(a),w.y(a),z):k},z.margin=function(a){return arguments.length?(b=a,z):b},z.width=function(a){return arguments.length?(d=a,z):d},z.height=function(a){return arguments.length?(e=a,f=a-g,z):e},z.contextHeight=function(a){return arguments.length?(g=a,f=e-a,z):g},z.dotRadius=function(a){return arguments.length?(h=d3.functor(a),v.dotRadius=a,z):h},z.id=function(a){return arguments.length?(l=a,z):l},z.xTickFormat=function(a){return arguments.length?(q.tickFormat(a),s.tickFormat(a),z):m.tickFormat()},z.yTickFormat=function(a){return arguments.length?(r.tickFormat(a),t.tickFormat(a),z):n.tickFormat()},z.xAxis=q,z.yAxis=r,z},a.models.lineWithLegend=function(){function p(a){return a.each(function(e){var q=c(),r=d(),s=q-b.left-b.right,t=r-b.top-b.bottom,u=e.filter(function(a){return!a.disabled}).map(function(a){return a.values.map(function(a,b){return{x:f(a,b),y:g(a,b)}})});j.domain(d3.extent(d3.merge(u),function(a){return a.x})).range([0,s]),k.domain(d3.extent(d3.merge(u),function(a){return a.y})).range([t,0]),o.width(s).height(t).color(e.map(function(a,b){return a.color||h[b%10]}).filter(function(a,b){return!e[b].disabled}));var v=d3.select(this).selectAll("g.wrap").data([e]),w=v.enter().append("g").attr("class","wrap d3lineWithLegend").append("g");w.append("g").attr("class","x axis"),w.append("g").attr("class","y axis"),w.append("g").attr("class","linesWrap"),w.append("g").attr("class","legendWrap"),n.dispatch.on("legendClick",function(b,c){b.disabled=!b.disabled,e.filter(function(a){return!a.disabled}).length||e.map(function(a){return a.disabled=!1,v.selectAll(".series").classed("disabled",!1),a}),a.transition().call(p)}),o.dispatch.on("pointMouseover.tooltip",function(a){i.tooltipShow({point:a.point,series:a.series,pos:[a.pos[0]+b.left,a.pos[1]+b.top],seriesIndex:a.seriesIndex,pointIndex:a.pointIndex})}),o.dispatch.on("pointMouseout.tooltip",function(a){i.tooltipHide(a)}),b.top=n.height();var z=v.select("g").attr("transform","translate("+b.left+","+b.top+")");n.width(q/2-b.right),z.select(".legendWrap").datum(e).attr("transform","translate("+(q/2-b.left)+","+ -b.top+")").call(n);var A=z.select(".linesWrap").datum(e.filter(function(a){return!a.disabled}));d3.transition(A).call(o),l.domain(j.domain()).range(j.range()).ticks(q/100).tickSize(-t,0),z.select(".x.axis").attr("transform","translate(0,"+k.range()[0]+")"),d3.transition(z.select(".x.axis")).call(l),m.domain(k.domain()).range(k.range()).ticks(r/36).tickSize(-s,0),d3.transition(z.select(".y.axis")).call(m)}),p}var b={top:30,right:20,bottom:50,left:60},c=function(){return 960},d=function(){return 500},e=function(){return 2.5},f=function(a){return a.x},g=function(a){return a.y},h=d3.scale.category10().range(),i=d3.dispatch("tooltipShow","tooltipHide"),j=d3.scale.linear(),k=d3.scale.linear(),l=a.models.axis().scale(j).orient("bottom"),m=a.models.axis().scale(k).orient("left"),n=a.models.legend().height(30),o=a.models.line();return p.dispatch=i,p.legend=n,p.xAxis=l,p.yAxis=m,d3.rebind(p,o,"interactive"),p.x=function(a){return arguments.length?(f=a,o.x(a),p):f},p.y=function(a){return arguments.length?(g=a,o.y(a),p):g},p.margin=function(a){return arguments.length?(b=a,p):b},p.width=function(a){return arguments.length?(c=d3.functor(a),p):c},p.height=function(a){return arguments.length?(d=d3.functor(a),p):d},p.dotRadius=function(a){return arguments.length?(e=d3.functor(a),o.dotRadius=a,p):e},p},a.models.pie=function(){function p(m){return m.each(function(m){function y(a){var b=(a.startAngle+a.endAngle)*90/Math.PI-90;return b>90?b-180:b}function z(a){a.innerRadius=0;var b=d3.interpolate({startAngle:0,endAngle:0},a);return function(a){return t(b(a))}}var n=d3.select(this).on("click",function(a,b){o.chartClick({data:a,index:b,pos:d3.event,id:h})}),p=n.selectAll("svg.margin").data([m]),q=p.enter();q.append("text").attr("class","title").attr("dy",".91em").attr("text-anchor","start").text(l),q.append("svg").attr("class","margin").attr("x",a.left).attr("y",a.top).style("overflow","visible");var r=p.selectAll("g.wrap").data([m]);r.exit().remove();var s=r.enter();s.append("g").attr("class","wrap").attr("id","wrap-"+h).append("g").attr("class","pie"),r.attr("width",b).attr("height",c).attr("transform","translate("+e+","+e+")");var t=d3.svg.arc().outerRadius(e-e/5);k&&t.innerRadius(e/2);var u=d3.layout.pie().value(function(a){return a[g]}),v=p.select(".pie").selectAll(".slice").data(u);v.exit().remove();var w=v.enter().append("svg:g").attr("class","slice").on("mouseover",function(a,b){d3.select(this).classed("hover",!0),o.tooltipShow({label:a.data[f],value:a.data[g],data:a.data,index:b,pos:[d3.event.pageX,d3.event.pageY],id:h})}).on("mouseout",function(a,b){d3.select(this).classed("hover",!1),o.tooltipHide({label:a.data[f],value:a.data[g],data:a.data,index:b,id:h})}).on("click",function(a,b){o.elementClick({label:a.data[f],value:a.data[g],data:a.data,index:b,pos:d3.event,id:h}),d3.event.stopPropagation()}).on("dblclick",function(a,b){o.elementDblClick({label:a.data[f],value:a.data[g],data:a.data,index:b,pos:d3.event,id:h}),d3.event.stopPropagation()}),x=w.append("svg:path").attr("class","path").attr("fill",function(a,b){return i(b)});v.select(".path").attr("d",t).transition().ease("bounce").duration(d).attrTween("d",z),j&&(w.append("text"),v.select("text").transition().duration(d).ease("bounce").attr("transform",function(a){return a.outerRadius=e+10,a.innerRadius=e+15,"translate("+t.centroid(a)+")"}).attr("text-anchor","middle").style("font","bold 12px Arial").text(function(a,b){return a.data[f]}))}),p}var a={top:20,right:20,bottom:20,left:20},b=500,c=500,d=2e3,e=Math.min(b-(a.right+a.left),c-(a.top+a.bottom))/2,f="label",g="y",h=Math.floor(Math.random()*1e4),i=d3.scale.category20(),j=!0,k=!1,l="",m=0,n=0,o=d3.dispatch("chartClick","elementClick","elementDblClick","tooltipShow","tooltipHide");return p.margin=function(b){return arguments.length?(a=b,p):a},p.width=function(d){return arguments.length?(a.left+a.right+20>d?b=a.left+a.right+20:b=d,e=Math.min(b-(a.left+a.right),c-(a.top+a.bottom))/2,p):b},p.height=function(d){return arguments.length?(a.top+a.bottom+20>d?c=a.top+a.bottom+20:c=d,e=Math.min(b-(a.left+a.right),c-(a.top+a.bottom))/2,p):c},p.animate=function(a){return arguments.length?(d=a,p):d},p.labelField=function(a){return arguments.length?(f=a,p):f},p.dataField=function(a){return arguments.length?(
-g=a,p):g},p.showLabels=function(a){return arguments.length?(j=a,p):j},p.donut=function(a){return arguments.length?(k=a,p):k},p.title=function(a){return arguments.length?(l=a,p):l},p.id=function(a){return arguments.length?(h=a,p):h},p.dispatch=o,p},a.models.scatter=function(){function z(n){return n.each(function(n){function G(){if(!l)return C.select("#points-clip-"+e).remove(),C.select(".point-paths").remove(),!1;F.append("g").attr("class","point-clips").append("clipPath").attr("id","points-clip-"+e),F.append("g").attr("class","point-paths");var b=d3.merge(n.map(function(a,b){return a.values.map(function(a,c){return[r(f(a,c))*(Math.random()/1e12+1),s(g(a,c))*(Math.random()/1e12+1),b,c]})})),c=C.select("#points-clip-"+e).selectAll("circle").data(b);c.enter().append("circle").attr("r",25),c.exit().remove(),c.attr("cx",function(a){return a[0]}).attr("cy",function(a){return a[1]}),C.select(".point-paths").attr("clip-path","url(#points-clip-"+e+")");var d=d3.geom.voronoi(b).map(function(a,c){return{data:a,series:b[c][2],point:b[c][3]}}),h=C.select(".point-paths").selectAll("path").data(d);h.enter().append("path").attr("class",function(a,b){return"path-"+b}),h.exit().remove(),h.attr("d",function(a){return"M"+a.data.join(",")+"Z"}).on("mouseover",function(b){var c=n[b.series],d=c.values[b.point];u.pointMouseover({point:d,series:c,pos:[r(f(d,b.point))+a.left,s(g(d,b.point))+a.top],seriesIndex:b.series,pointIndex:b.point})}).on("mouseout",function(a,b){u.pointMouseout({point:n[a.series].values[a.point],series:n[a.series],seriesIndex:a.series,pointIndex:a.point})}),u.on("pointMouseover.point",function(b){C.select(".series-"+b.seriesIndex+" .point-"+b.pointIndex).classed("hover",!0),C.select(".series-"+b.seriesIndex+" .distX-"+b.pointIndex).attr("y1",b.pos[1]-a.top),C.select(".series-"+b.seriesIndex+" .distY-"+b.pointIndex).attr("x1",b.pos[0]-a.left)}),u.on("pointMouseout.point",function(a){C.select(".series-"+a.seriesIndex+" circle.point-"+a.pointIndex).classed("hover",!1),C.select(".series-"+a.seriesIndex+" .distX-"+a.pointIndex).attr("y1",s.range()[0]),C.select(".series-"+a.seriesIndex+" .distY-"+a.pointIndex).attr("x1",r.range()[0])})}var z=n.map(function(a){return a.values.map(function(a,b){return{x:f(a,b),y:g(a,b),size:h(a,b)}})}),A=b-a.left-a.right,B=c-a.top-a.bottom;v=v||r,w=w||s,x=x||t,n=n.map(function(a,b){return a.values=a.values.map(function(a){return a.series=b,a}),a}),r.domain(o||d3.extent(d3.merge(z).map(function(a){return a.x}).concat(i))).range([0,A]),s.domain(p||d3.extent(d3.merge(z).map(function(a){return a.y}).concat(j))).range([B,0]),t.domain(q||d3.extent(d3.merge(z).map(function(a){return a.size}).concat(k))).range([2,10]);var C=d3.select(this).selectAll("g.d3scatter").data([n]),D=C.enter().append("g").attr("class","d3scatter"),E=D.append("defs"),F=D.append("g");F.append("g").attr("class","groups"),F.append("g").attr("class","distribution"),C.attr("transform","translate("+a.left+","+a.top+")"),E.append("clipPath").attr("id","edge-clip-"+e).append("rect"),C.select("#edge-clip-"+e+" rect").attr("width",A).attr("height",B),F.attr("clip-path",m?"url(#edge-clip-"+e+")":null);var H=C.select(".groups").selectAll(".group").data(function(a){return a},function(a){return a.key});H.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),d3.transition(H.exit()).style("stroke-opacity",1e-6).style("fill-opacity",1e-6).remove(),H.attr("class",function(a,b){return"group series-"+b}).classed("hover",function(a){return a.hover&&!a.disabled}),d3.transition(H).style("fill",function(a,b){return d[b%10]}).style("stroke",function(a,b){return d[b%10]}).style("stroke-opacity",1).style("fill-opacity",.5);var I=H.selectAll("circle.point").data(function(a){return a.values});I.enter().append("circle").attr("cx",function(a,b){return v(f(a,b))}).attr("cy",function(a,b){return w(g(a,b))}).attr("r",function(a,b){return x(h(a,b))}),d3.transition(H.exit().selectAll("circle.point")).attr("cx",function(a,b){return r(f(a,b))}).attr("cy",function(a,b){return s(g(a,b))}).attr("r",function(a,b){return t(h(a,b))}).remove(),I.attr("class",function(a,b){return"point point-"+b}),d3.transition(I).attr("cx",function(a,b){return r(f(a,b))}).attr("cy",function(a,b){return s(g(a,b))}).attr("r",function(a,b){return t(h(a,b))});var J=H.selectAll("line.distX").data(function(a){return a.values});J.enter().append("line").attr("x1",function(a,b){return v(f(a,b))}).attr("x2",function(a,b){return v(f(a,b))}),d3.transition(H.exit().selectAll("line.distX")).attr("x1",function(a,b){return r(f(a,b))}).attr("x2",function(a,b){return r(f(a,b))}).remove(),J.attr("class",function(a,b){return"distX distX-"+b}).attr("y1",s.range()[0]).attr("y2",s.range()[0]+8),d3.transition(J).attr("x1",function(a,b){return r(f(a,b))}).attr("x2",function(a,b){return r(f(a,b))});var K=H.selectAll("line.distY").data(function(a){return a.values});K.enter().append("line").attr("y1",function(a,b){return w(g(a,b))}).attr("y2",function(a,b){return w(g(a,b))}),d3.transition(H.exit().selectAll("line.distY")).attr("y1",function(a,b){return s(g(a,b))}).attr("y2",function(a,b){return s(g(a,b))}).remove(),K.attr("class",function(a,b){return"distY distY-"+b}).attr("x1",r.range()[0]).attr("x2",r.range()[0]-8),d3.transition(K).attr("y1",function(a,b){return s(g(a,b))}).attr("y2",function(a,b){return s(g(a,b))}),clearTimeout(y),y=setTimeout(G,750),v=r.copy(),w=s.copy(),x=t.copy()}),z}var a={top:0,right:0,bottom:0,left:0},b=960,c=500,d=d3.scale.category10().range(),e=Math.floor(Math.random()*1e5),f=function(a){return a.x},g=function(a){return a.y},h=function(a){return a.size},i=[],j=[],k=[],l=!0,m=!1,n=!0,o,p,q,r=d3.scale.linear(),s=d3.scale.linear(),t=d3.scale.sqrt(),u=d3.dispatch("pointMouseover","pointMouseout"),v,w,x,y;return z.dispatch=u,z.margin=function(b){return arguments.length?(a=b,z):a},z.width=function(a){return arguments.length?(b=a,z):b},z.height=function(a){return arguments.length?(c=a,z):c},z.x=function(a){return arguments.length?(f=d3.functor(a),z):f},z.y=function(a){return arguments.length?(g=d3.functor(a),z):g},z.size=function(a){return arguments.length?(h=d3.functor(a),z):h},z.xDomain=function(a){return arguments.length?(o=a,z):o},z.yDomain=function(a){return arguments.length?(p=a,z):p},z.sizeDomain=function(a){return arguments.length?(q=a,z):q},z.forceX=function(a){return arguments.length?(i=a,z):i},z.forceY=function(a){return arguments.length?(j=a,z):j},z.forceSize=function(a){return arguments.length?(k=a,z):k},z.interactive=function(a){return arguments.length?(l=a,z):l},z.clipEdge=function(a){return arguments.length?(m=a,z):m},z.clipVoronoi=function(a){return arguments.length?(n=a,z):n},z.color=function(a){return arguments.length?(d=a,z):d},z.id=function(a){return arguments.length?(e=a,z):e},z},a.models.scatterWithLegend=function(){function w(a){return a.each(function(f){var g=f.filter(function(a){return!a.disabled}).map(function(a){return a.values});q.domain(d3.extent(d3.merge(g).map(k).concat(n))).range([0,c-b.left-b.right]),r.domain(d3.extent(d3.merge(g).map(l).concat(o))).range([d-b.top-b.bottom,0]),v.width(c-b.left-b.right).height(d-b.top-b.bottom).color(f.map(function(a,b){return a.color||j[b%20]}).filter(function(a,b){return!f[b].disabled})),s.ticks(c/100).tickSize(-(d-b.top-b.bottom),0),t.ticks(d/36).tickSize(-(c-b.right-b.left),0);var h=d3.select(this).selectAll("g.wrap").data([f]),i=h.enter().append("g").attr("class","wrap d3scatterWithLegend").append("g");i.append("g").attr("class","legendWrap"),i.append("g").attr("class","x axis"),i.append("g").attr("class","y axis"),i.append("g").attr("class","scatterWrap"),u.dispatch.on("legendClick",function(b,c,d){b.disabled=!b.disabled,f.filter(function(a){return!a.disabled}).length||f.map(function(a){return a.disabled=!1,h.selectAll(".series").classed("disabled",!1),a}),a.transition(e).call(w)}),v.dispatch.on("pointMouseover.tooltip",function(a){p.tooltipShow({point:a.point,series:a.series,pos:[a.pos[0]+b.left,a.pos[1]+b.top],seriesIndex:a.seriesIndex,pointIndex:a.pointIndex})}),v.dispatch.on("pointMouseout.tooltip",function(a){p.tooltipHide(a)}),u.width(c/2-b.right),h.select(".legendWrap").datum(f).attr("transform","translate("+(c/2-b.left)+","+ -u.height()+")").call(u),b.top=u.height();var m=h.select("g").attr("transform","translate("+b.left+","+b.top+")"),z=h.select(".scatterWrap").datum(f.filter(function(a){return!a.disabled}));d3.transition(z).call(v),s.domain(q.domain()).range(q.range()).ticks(c/100).tickSize(-(d-b.top-b.bottom),0),m.select(".x.axis").attr("transform","translate(0,"+r.range()[0]+")"),d3.transition(m.select(".x.axis")).call(s),t.domain(r.domain()).range(r.range()).ticks(d/36).tickSize(-(c-b.right-b.left),0),d3.transition(m.select(".y.axis")).call(t)}),w}var b={top:30,right:20,bottom:50,left:60},c=960,d=500,e=500,f=!0,g=!0,h=!1,i=!1,j=d3.scale.category10().range(),k=function(a){return a.x},l=function(a){return a.y},m=function(a){return a.size},n=[],o=[],p=d3.dispatch("tooltipShow","tooltipHide"),q=d3.scale.linear(),r=d3.scale.linear(),s=a.models.axis().scale(q).orient("bottom").tickPadding(10),t=a.models.axis().scale(r).orient("left").tickPadding(10),u=a.models.legend().height(30),v=a.models.scatter();return w.dispatch=p,w.margin=function(a){return arguments.length?(b=a,w):b},w.width=function(a){return arguments.length?(c=a,w):c},w.height=function(a){return arguments.length?(d=a,w):d},w.forceX=function(a){return arguments.length?(n=a,v.forceX(a),w):n},w.forceY=function(a){return arguments.length?(o=a,v.forceY(a),w):o},w.animate=function(a){return arguments.length?(e=a,w):e},w.xAxis=s,w.yAxis=t,w},a.models.sparkline=function(){function h(d){return d.each(function(d){f.domain(d3.extent(d,function(a){return a.x})).range([0,b-a.left-a.right]),g.domain(d3.extent(d,function(a){return a.y})).range([c-a.top-a.bottom,0]);var h=d3.select(this).selectAll("svg").data([d]),i=h.enter().append("svg").append("g");i.append("g").attr("class","sparkline").attr("transform","translate("+a.left+","+a.top+")").style("stroke",function(a,b){return a.color||e[b*2%20]}),h.attr("width",b).attr("height",c);var j=i.select(".sparkline").selectAll("path").data(function(a){return[a]});j.enter().append("path"),j.exit().remove(),j.attr("d",d3.svg.line().x(function(a){return f(a.x)}).y(function(a){return g(a.y)}));var k=i.select(".sparkline").selectAll("circle.point").data(function(a){return a.filter(function(a){return g.domain().indexOf(a.y)!=-1})});k.enter().append("circle").attr("class","point"),k.exit().remove(),k.attr("cx",function(a){return f(a.x)}).attr("cy",function(a){return g(a.y)}).attr("r",2).style("stroke",function(a,b){return a.y==g.domain()[0]?"#d62728":"#2ca02c"}).style("fill",function(a,b){return a.y==g.domain()[0]?"#d62728":"#2ca02c"})}),h}var a={top:3,right:3,bottom:3,left:3},b=200,c=20,d=!0,e=d3.scale.category20().range(),f=d3.scale.linear(),g=d3.scale.linear();return h.margin=function(b){return arguments.length?(a=b,h):a},h.width=function(a){return arguments.length?(b=a,h):b},h.height=function(a){return arguments.length?(c=a,h):c},h.animate=function(a){return arguments.length?(d=a,h):d},h},a.models.stackedArea=function(){function q(a){return a.each(function(a){var h=JSON.parse(JSON.stringify(a)),m=h.map(function(a){return a.values.map(function(a,b){return{x:f(a,b),y:g(a,b)}})}),q=c-b.left-b.right,r=d-b.top-b.bottom;h=d3.layout.stack().offset(i).order(j).values(function(a){return a.values}).y(g)(h),o.domain(k||d3.extent(d3.merge(m),function(a){return a.x})).range([0,q]),p.domain(l||[0,d3.max(h,function(a){return d3.max(a.values,function(a){return a.y0+a.y})})]).range([r,0]),n.width(q).height(r).xDomain(o.domain()).yDomain(p.domain()).x(f).y(function(a){return a.y+a.y0}).color(a.map(function(a,b){return a.color||e[b%10]}).filter(function(b,c){return!a[c].disabled}));var s=d3.select(this).selectAll("g.d3stackedarea").data([h]),t=s.enter().append("g").attr("class","d3stackedarea").append("g");t.append("g").attr("class","areaWrap"),t.append("g").attr("class","linesWrap");var u=s.select("g").attr("transform","translate("+b.left+","+b.top+")"),v=u.select(".linesWrap").datum(h.filter(function(a){return!a.disabled}));d3.transition(v).call(n);var w=d3.svg.area().x(function(a,b){return o(f(a,b))}).y0(function(a){return p(a.y0)}).y1(function(a){return p(a.y+a.y0)}),z=d3.svg.area().x(function(a,b){return o(f(a,b))}).y0(function(a){return p(a.y0)}).y1(function(a){return p(a.y0)}),A=u.select(".areaWrap").selectAll("path.area").data(function(a){return a});A.enter().append("path").attr("class","area"),d3.transition(A.exit()).attr("d",function(a,b){return z(a.values,b)}).remove(),A.style("fill",function(a,b){return e[b%10]}).style("stroke",function(a,b){return e[b%10]}),d3.transition(A).attr("d",function(a,b){return w(a.values,b)})}),q}var b={top:0,right:0,bottom:0,left:0},c=960,d=500,e=d3.scale.category10().range(),f=function(a){return a.x},g=function(a){return a.y},h="stack",i="zero",j="default",k,l,m=d3.dispatch("tooltipShow","tooltipHide"),n=a.models.line(),o=d3.scale.linear(),p=d3.scale.linear();return q.x=function(a){return arguments.length?(f=d3.functor(a),q):f},q.y=function(a){return arguments.length?(g=d3.functor(a),q):g},q.margin=function(a){return arguments.length?(b=a,q):b},q.width=function(a){return arguments.length?(c=a,q):c},q.height=function(a){return arguments.length?(d=a,q):d},q.color=function(a){return arguments.length?(e=a,q):e},q.offset=function(a){return arguments.length?(i=a,q):i},q.order=function(a){return arguments.length?(j=a,q):j},q.style=function(a){if(!arguments.length)return h;h=a;switch(h){case"stack":i="zero",j="default";break;case"stream":i="wiggle",j="inside-out";break;case"expand":i="expand",j="default"}return q},q.dispatch=m,n.dispatch.on("pointMouseover.tooltip",function(a){m.tooltipShow({point:a.point,series:a.series,pos:[a.pos[0]+b.left,a.pos[1]+b.top],seriesIndex:a.seriesIndex,pointIndex:a.pointIndex})}),n.dispatch.on("pointMouseout.tooltip",function(a){m.tooltipHide(a)}),q},a.models.stackedAreaWithLegend=function(){function r(a){return a.each(function(e){var f=c(),s=d(),t=f-b.left-b.right,u=s-b.top-b.bottom,v=e.filter(function(a){return!a.disabled}).reduce(function(a,b,c){return b.values.forEach(function(b,d){c||(a[d]={x:j(b.x,d),y:0}),a[d].y+=k(b)}),a},[]);h.domain(d3.extent(d3.merge(v),function(a){return a.x})).range([0,t]),i.domain(p.offset()=="zero"?[0,d3.max(v,function(a){return a.y})]:[0,1]).range([u,0]),p.width(t).height(u);var w=d3.select(this).selectAll("g.wrap").data([e]),z=w.enter().append("g").attr("class","wrap d3stackedWithLegend").append("g");z.append("g").attr("class","x axis"),z.append("g").attr("class","y axis"),z.append("g").attr("class","stackedWrap"),z.append("g").attr("class","legendWrap"),z.append("g").attr("class","controlsWrap"),n.dispatch.on("legendClick",function(b,c){b.disabled=!b.disabled,b.disabled?b.values.map(function(a){return a._y=a.y,a.y=0,a}):b.values.map(function(a){return a.y=a._y,a}),e.filter(function(a){return!a.disabled}).length||e.map(function(a){return a.disabled=!1,a.values.map(function(a){return a.y=a._y,a}),a}),a.transition().call(r)}),o.dispatch.on("legendClick",function(b,c){if(!b.disabled)return;q=q.map(function(a){return a.disabled=!0,a}),b.disabled=!1;switch(b.key){case"Stacked":p.style("stack");break;case"Stream":p.style("stream");break;case"Expanded":p.style("expand")}a.transition().call(r)}),p.dispatch.on("tooltipShow",function(a){if(!Math.round(k(a.point)*100))return setTimeout(function(){d3.selectAll(".point.hover").classed("hover",!1)},0),!1;g.tooltipShow({point:a.point,series:a.series,pos:[a.pos[0]+b.left,a.pos[1]+b.top],seriesIndex:a.seriesIndex,pointIndex:a.pointIndex})}),p.dispatch.on("tooltipHide",function(a){g.tooltipHide(a)}),b.top=n.height();var A=w.select("g").attr("transform","translate("+b.left+","+b.top+")");n.width(f/2-b.right),A.select(".legendWrap").datum(e).attr("transform","translate("+(f/2-b.left)+","+ -b.top+")").call(n),o.width(280).color(["#444","#444","#444"]),A.select(".controlsWrap").datum(q).attr("transform","translate(0,"+ -b.top+")").call(o);var B=A.select(".stackedWrap").datum(e);d3.transition(B).call(p),l.domain(h.domain()).range(h.range()).ticks(f/100).tickSize(-u,0),A.select(".x.axis").attr("transform","translate(0,"+u+")"),d3.transition(A.select(".x.axis")).call(l),m.domain(i.domain()).range(i.range()).ticks(p.offset()=="wiggle"?0:s/36).tickSize(-t,0).tickFormat(p.offset()=="zero"?d3.format(",.2f"):d3.format("%")),d3.transition(A.select(".y.axis")).call(m)}),r}var b={top:30,right:20,bottom:50,left:60},c=function(){return 960},d=function(){return 500},e=function(){return 2.5},f=d3.scale.category10().range(),g=d3.dispatch("tooltipShow","tooltipHide"),h=d3.scale.linear(),i=d3.scale.linear(),j=function(a){return a.x},k=function(a){return a.y},l=a.models.axis().scale(h).orient("bottom"),m=a.models.axis().scale(i).orient("left"),n=a.models.legend().height(30),o=a.models.legend().height(30),p=a.models.stackedArea(),q=[{key:"Stacked"},{key:"Stream",disabled:!0},{key:"Expanded",disabled:!0}];return r.dispatch=g,r.x=function(a){return arguments.length?(j=d3.functor(a),p.x(j),r):j},r.y=function(a){return arguments.length?(k=d3.functor(a),p.y(k),r):k},r.margin=function(a){return arguments.length?(b=a,r):b},r.width=function(a){return arguments.length?(c=d3.functor(a),r):c},r.height=function(a){return arguments.length?(d=d3.functor(a),r):d},r.dotRadius=function(a){return arguments.length?(e=d3.functor(a),p.dotRadius=a,r):e},r.stacked=p,r.xAxis=l,r.yAxis=m,r},a.charts.cumulativeLineChartDaily=function(){function h(){return!b||!c.length?h:(d3.select(b).select("svg").datum(c).transition().duration(d).call(f),h)}var b=null,c=[],d=500,e=function(a,b,c,d,e){return"<h3>"+a+"</h3>"+"<p>"+c+" at "+b+"</p>"},f=a.models.cumulativeLine().x(function(a,b){return b}),g=function(c){var d=document.getElementById(b.substr(1)),g=c.pos[0]+d.offsetLeft,h=c.pos[1]+d.offsetTop,i=f.xAxis.tickFormat(),j=f.yAxis.tickFormat(),k=i(f.x()(c,c.pointIndex)),l=j(f.y()(c.point)),m=e(c.series.key,k,l,c,f);a.tooltip.show([g,h],m)};return f.xAxis.tickFormat(function(a){return d3.time.format("%x")(new Date(c[0].values[a].x))}),f.yAxis.tickFormat(d3.format(",.2%")),h.build=function(){return!b||!c.length?h:(a.addGraph({generate:function(){var a=d3.select(b),e=function(){return parseInt(a.style("width"))},g=function(){return parseInt(a.style("height"))},h=a.append("svg");return f.width(e).height(g),h.attr("width",e()).attr("height",g()).datum(c).transition().duration(d).call(f),f},callback:function(c){c.dispatch.on("tooltipShow",g),c.dispatch.on("tooltipHide",a.tooltip.cleanup),window.onresize=function(){d3.select(b+" svg").attr("width",c.width()()).attr("height",c.height()()).call(c)}}}),h)},h.data=function(a){return arguments.length?(c=a,h):c},h.selector=function(a){return arguments.length?(b=a,h):b},h.duration=function(a){return arguments.length?(d=a,h):d},h.tooltip=function(a){return arguments.length?(e=a,h):e},h.xTickFormat=function(a){return arguments.length?(f.xAxis.tickFormat(typeof a=="function"?a:d3.format(a)),h):f.xAxis.tickFormat()},h.yTickFormat=function(a){return arguments.length?(f.yAxis.tickFormat(typeof a=="function"?a:d3.format(a)),h):f.yAxis.tickFormat()},h.xAxisLabel=function(a){return arguments.length?(f.xAxis.axisLabel(a),h):f.xAxis.axisLabel()},h.yAxisLabel=function(a){return arguments.length?(f.yAxis.axisLabel(a),h):f.yAxis.axisLabel()},d3.rebind(h,f,"x","y"),h.graph=f,h},a.charts.line=function(){function h(){return!b||!c.length?h:(d3.select(b).select("svg").datum(c).transition().duration(d).call(f),h)}var b=null,c=[],d=500,e=function(a,b,c,d,e){return"<h3>"+a+"</h3>"+"<p>"+c+" at "+b+"</p>"},f=a.models.lineWithLegend(),g=function(c){var d=document.getElementById(b.substr(1)),g=c.pos[0]+d.offsetLeft,h=c.pos[1]+d.offsetTop,i=f.xAxis.tickFormat(),j=f.yAxis.tickFormat(),k=i(f.x()(c.point)),l=j(f.y()(c.point)),m=e(c.series.key,k,l,c,f);a.tooltip.show([g,h],m)};return f.xAxis.tickFormat(d3.format(",r")),f.yAxis.tickFormat(d3.format(",.2f")),h.build=function(){return!b||!c.length?h:(a.addGraph({generate:function(){var a=d3.select(b),e=function(){return parseInt(a.style("width"))},g=function(){return parseInt(a.style("height"))},h=a.append("svg");return f.width(e).height(g),h.attr("width",e()).attr("height",g()).datum(c).transition().duration(d).call(f),f},callback:function(c){c.dispatch.on("tooltipShow",g),c.dispatch.on("tooltipHide",a.tooltip.cleanup),window.onresize=function(){d3.select(b+" svg").attr("width",c.width()()).attr("height",c.height()()).call(c)}}}),h)},h.data=function(a){return arguments.length?(c=a,h):c},h.selector=function(a){return arguments.length?(b=a,h):b},h.duration=function(a){return arguments.length?(d=a,h):d},h.tooltip=function(a){return arguments.length?(e=a,h):e},h.xTickFormat=function(a){return arguments.length?(f.xAxis.tickFormat(typeof a=="function"?a:d3.format(a)),h):f.xAxis.tickFormat()},h.yTickFormat=function(a){return arguments.length?(f.yAxis.tickFormat(typeof a=="function"?a:d3.format(a)),h):f.yAxis.tickFormat()},h.xAxisLabel=function(a){return arguments.length?(f.xAxis.axisLabel(a),h):f.xAxis.axisLabel()},h.yAxisLabel=function(a){return arguments.length?(f.yAxis.axisLabel(a),h):f.yAxis.axisLabel()},d3.rebind(h,f,"x","y"),h.graph=f,h},a.charts.lineChartDaily=function(){function h(){return!b||!c.length?h:(d3.select(b).select("svg").datum(c).transition().duration(d).call(f),h)}var b=null,c=[],d=500,e=function(a,b,c,d,e){return"<h3>"+a+"</h3>"+"<p>"+c+" at "+b+"</p>"},f=a.models.lineWithLegend().x(function(a,b){return b}),g=function(c){var d=document.getElementById(b.substr(1)),g=c.pos[0]+d.offsetLeft,h=c.pos[1]+d.offsetTop,i=f.xAxis.tickFormat(),j=f.yAxis.tickFormat(),k=i(f.x()(c,c.pointIndex)),l=j(f.y()(c.point)),m=e(c.series.key,k,l,c,f);a.tooltip.show([g,h],m)};return f.xAxis.tickFormat(function(a){return d3.time.format("%x")(new Date(c[0].values[a].x))}),f.yAxis.tickFormat(d3.format(",.2%")),h.build=function(){return!b||!c.length?h:(a.addGraph({generate:function(){var a=d3.select(b),e=function(){return parseInt(a.style("width"))},g=function(){return parseInt(a.style("height"))},h=a.append("svg");return f.width(e).height(g),h.attr("width",e()).attr("height",g()).datum(c).transition().duration(d).call(f),f},callback:function(c){c.dispatch.on("tooltipShow",g),c.dispatch.on("tooltipHide",a.tooltip.cleanup),window.onresize=function(){d3.select(b+" svg").attr("width",c.width()()).attr("height",c.height()()).call(c)}}}),h)},h.data=function(a){return arguments.length?(c=a,h):c},h.selector=function(a){return arguments.length?(b=a,h):b},h.duration=function(a){return arguments.length?(d=a,h):d},h.tooltip=function(a){return arguments.length?(e=a,h):e},h.xTickFormat=function(a){return arguments.length?(f.xAxis.tickFormat(typeof a=="function"?a:d3.format(a)),h):f.xAxis.tickFormat()},h.yTickFormat=function(a){return arguments.length?(f.yAxis.tickFormat(typeof a=="function"?a:d3.format(a)),h):f.yAxis.tickFormat()},h.xAxisLabel=function(a){return arguments.length?(f.xAxis.axisLabel(a),h):f.xAxis.axisLabel()},h.yAxisLabel=function(a){return arguments.length?(f.yAxis.axisLabel(a),h):f.yAxis.axisLabel()},d3.rebind(h,f,"x","y"),h.graph=f,h}})();
\ No newline at end of file
+g=a,p):g},p.showLabels=function(a){return arguments.length?(j=a,p):j},p.donut=function(a){return arguments.length?(k=a,p):k},p.title=function(a){return arguments.length?(l=a,p):l},p.id=function(a){return arguments.length?(h=a,p):h},p.dispatch=o,p},a.models.scatter=function(){function z(n){return n.each(function(n){function G(){if(!l)return C.select("#points-clip-"+e).remove(),C.select(".point-paths").remove(),!1;E.append("clipPath").attr("id","points-clip-"+e),F.append("g").attr("class","point-paths");var b=d3.merge(n.map(function(a,b){return a.values.map(function(a,c){return[r(f(a,c))*(Math.random()/1e12+1),s(g(a,c))*(Math.random()/1e12+1),b,c]})})),c=C.select("#points-clip-"+e).selectAll("circle").data(b);c.enter().append("circle").attr("r",25),c.exit().remove(),c.attr("cx",function(a){return a[0]}).attr("cy",function(a){return a[1]}),C.select(".point-paths").attr("clip-path","url(#points-clip-"+e+")");var d=d3.geom.voronoi(b).map(function(a,c){return{data:a,series:b[c][2],point:b[c][3]}}),h=C.select(".point-paths").selectAll("path").data(d);h.enter().append("path").attr("class",function(a,b){return"path-"+b}),h.exit().remove(),h.attr("d",function(a){return"M"+a.data.join(",")+"Z"}).on("mouseover",function(b){var c=n[b.series],d=c.values[b.point];u.pointMouseover({point:d,series:c,pos:[r(f(d,b.point))+a.left,s(g(d,b.point))+a.top],seriesIndex:b.series,pointIndex:b.point})}).on("mouseout",function(a,b){u.pointMouseout({point:n[a.series].values[a.point],series:n[a.series],seriesIndex:a.series,pointIndex:a.point})}),u.on("pointMouseover.point",function(b){C.select(".series-"+b.seriesIndex+" .point-"+b.pointIndex).classed("hover",!0),C.select(".series-"+b.seriesIndex+" .distX-"+b.pointIndex).attr("y1",b.pos[1]-a.top),C.select(".series-"+b.seriesIndex+" .distY-"+b.pointIndex).attr("x1",b.pos[0]-a.left)}),u.on("pointMouseout.point",function(a){C.select(".series-"+a.seriesIndex+" circle.point-"+a.pointIndex).classed("hover",!1),C.select(".series-"+a.seriesIndex+" .distX-"+a.pointIndex).attr("y1",s.range()[0]),C.select(".series-"+a.seriesIndex+" .distY-"+a.pointIndex).attr("x1",r.range()[0])})}var z=n.map(function(a){return a.values.map(function(a,b){return{x:f(a,b),y:g(a,b),size:h(a,b)}})}),A=b-a.left-a.right,B=c-a.top-a.bottom;v=v||r,w=w||s,x=x||t,n=n.map(function(a,b){return a.values=a.values.map(function(a){return a.series=b,a}),a}),r.domain(o||d3.extent(d3.merge(z).map(function(a){return a.x}).concat(i))).range([0,A]),s.domain(p||d3.extent(d3.merge(z).map(function(a){return a.y}).concat(j))).range([B,0]),t.domain(q||d3.extent(d3.merge(z).map(function(a){return a.size}).concat(k))).range([2,10]);var C=d3.select(this).selectAll("g.d3scatter").data([n]),D=C.enter().append("g").attr("class","d3scatter"),E=D.append("defs"),F=D.append("g");F.append("g").attr("class","groups"),F.append("g").attr("class","distribution"),C.attr("transform","translate("+a.left+","+a.top+")"),E.append("clipPath").attr("id","edge-clip-"+e).append("rect"),C.select("#edge-clip-"+e+" rect").attr("width",A).attr("height",B),F.attr("clip-path",m?"url(#edge-clip-"+e+")":null);var H=C.select(".groups").selectAll(".group").data(function(a){return a},function(a){return a.key});H.enter().append("g").style("stroke-opacity",1e-6).style("fill-opacity",1e-6),d3.transition(H.exit()).style("stroke-opacity",1e-6).style("fill-opacity",1e-6).remove(),H.attr("class",function(a,b){return"group series-"+b}).classed("hover",function(a){return a.hover&&!a.disabled}),d3.transition(H).style("fill",function(a,b){return d[b%10]}).style("stroke",function(a,b){return d[b%10]}).style("stroke-opacity",1).style("fill-opacity",.5);var I=H.selectAll("circle.point").data(function(a){return a.values});I.enter().append("circle").attr("cx",function(a,b){return v(f(a,b))}).attr("cy",function(a,b){return w(g(a,b))}).attr("r",function(a,b){return x(h(a,b))}),d3.transition(H.exit().selectAll("circle.point")).attr("cx",function(a,b){return r(f(a,b))}).attr("cy",function(a,b){return s(g(a,b))}).attr("r",function(a,b){return t(h(a,b))}).remove(),I.attr("class",function(a,b){return"point point-"+b}),d3.transition(I).attr("cx",function(a,b){return r(f(a,b))}).attr("cy",function(a,b){return s(g(a,b))}).attr("r",function(a,b){return t(h(a,b))});var J=H.selectAll("line.distX").data(function(a){return a.values});J.enter().append("line").attr("x1",function(a,b){return v(f(a,b))}).attr("x2",function(a,b){return v(f(a,b))}),d3.transition(H.exit().selectAll("line.distX")).attr("x1",function(a,b){return r(f(a,b))}).attr("x2",function(a,b){return r(f(a,b))}).remove(),J.attr("class",function(a,b){return"distX distX-"+b}).attr("y1",s.range()[0]).attr("y2",s.range()[0]+8),d3.transition(J).attr("x1",function(a,b){return r(f(a,b))}).attr("x2",function(a,b){return r(f(a,b))});var K=H.selectAll("line.distY").data(function(a){return a.values});K.enter().append("line").attr("y1",function(a,b){return w(g(a,b))}).attr("y2",function(a,b){return w(g(a,b))}),d3.transition(H.exit().selectAll("line.distY")).attr("y1",function(a,b){return s(g(a,b))}).attr("y2",function(a,b){return s(g(a,b))}).remove(),K.attr("class",function(a,b){return"distY distY-"+b}).attr("x1",r.range()[0]).attr("x2",r.range()[0]-8),d3.transition(K).attr("y1",function(a,b){return s(g(a,b))}).attr("y2",function(a,b){return s(g(a,b))}),clearTimeout(y),y=setTimeout(G,750),v=r.copy(),w=s.copy(),x=t.copy()}),z}var a={top:0,right:0,bottom:0,left:0},b=960,c=500,d=d3.scale.category10().range(),e=Math.floor(Math.random()*1e5),f=function(a){return a.x},g=function(a){return a.y},h=function(a){return a.size},i=[],j=[],k=[],l=!0,m=!1,n=!0,o,p,q,r=d3.scale.linear(),s=d3.scale.linear(),t=d3.scale.sqrt(),u=d3.dispatch("pointMouseover","pointMouseout"),v,w,x,y;return z.dispatch=u,z.margin=function(b){return arguments.length?(a=b,z):a},z.width=function(a){return arguments.length?(b=a,z):b},z.height=function(a){return arguments.length?(c=a,z):c},z.x=function(a){return arguments.length?(f=d3.functor(a),z):f},z.y=function(a){return arguments.length?(g=d3.functor(a),z):g},z.size=function(a){return arguments.length?(h=d3.functor(a),z):h},z.xDomain=function(a){return arguments.length?(o=a,z):o},z.yDomain=function(a){return arguments.length?(p=a,z):p},z.sizeDomain=function(a){return arguments.length?(q=a,z):q},z.forceX=function(a){return arguments.length?(i=a,z):i},z.forceY=function(a){return arguments.length?(j=a,z):j},z.forceSize=function(a){return arguments.length?(k=a,z):k},z.interactive=function(a){return arguments.length?(l=a,z):l},z.clipEdge=function(a){return arguments.length?(m=a,z):m},z.clipVoronoi=function(a){return arguments.length?(n=a,z):n},z.color=function(a){return arguments.length?(d=a,z):d},z.id=function(a){return arguments.length?(e=a,z):e},z},a.models.scatterWithLegend=function(){function w(a){return a.each(function(f){var g=f.filter(function(a){return!a.disabled}).map(function(a){return a.values});q.domain(d3.extent(d3.merge(g).map(k).concat(n))).range([0,c-b.left-b.right]),r.domain(d3.extent(d3.merge(g).map(l).concat(o))).range([d-b.top-b.bottom,0]),v.width(c-b.left-b.right).height(d-b.top-b.bottom).color(f.map(function(a,b){return a.color||j[b%20]}).filter(function(a,b){return!f[b].disabled})),s.ticks(c/100).tickSize(-(d-b.top-b.bottom),0),t.ticks(d/36).tickSize(-(c-b.right-b.left),0);var h=d3.select(this).selectAll("g.wrap").data([f]),i=h.enter().append("g").attr("class","wrap d3scatterWithLegend").append("g");i.append("g").attr("class","legendWrap"),i.append("g").attr("class","x axis"),i.append("g").attr("class","y axis"),i.append("g").attr("class","scatterWrap"),u.dispatch.on("legendClick",function(b,c,d){b.disabled=!b.disabled,f.filter(function(a){return!a.disabled}).length||f.map(function(a){return a.disabled=!1,h.selectAll(".series").classed("disabled",!1),a}),a.transition(e).call(w)}),v.dispatch.on("pointMouseover.tooltip",function(a){p.tooltipShow({point:a.point,series:a.series,pos:[a.pos[0]+b.left,a.pos[1]+b.top],seriesIndex:a.seriesIndex,pointIndex:a.pointIndex})}),v.dispatch.on("pointMouseout.tooltip",function(a){p.tooltipHide(a)}),u.width(c/2-b.right),h.select(".legendWrap").datum(f).attr("transform","translate("+(c/2-b.left)+","+ -u.height()+")").call(u),b.top=u.height();var m=h.select("g").attr("transform","translate("+b.left+","+b.top+")"),z=h.select(".scatterWrap").datum(f.filter(function(a){return!a.disabled}));d3.transition(z).call(v),s.domain(q.domain()).range(q.range()).ticks(c/100).tickSize(-(d-b.top-b.bottom),0),m.select(".x.axis").attr("transform","translate(0,"+r.range()[0]+")"),d3.transition(m.select(".x.axis")).call(s),t.domain(r.domain()).range(r.range()).ticks(d/36).tickSize(-(c-b.right-b.left),0),d3.transition(m.select(".y.axis")).call(t)}),w}var b={top:30,right:20,bottom:50,left:60},c=960,d=500,e=500,f=!0,g=!0,h=!1,i=!1,j=d3.scale.category10().range(),k=function(a){return a.x},l=function(a){return a.y},m=function(a){return a.size},n=[],o=[],p=d3.dispatch("tooltipShow","tooltipHide"),q=d3.scale.linear(),r=d3.scale.linear(),s=a.models.axis().scale(q).orient("bottom").tickPadding(10),t=a.models.axis().scale(r).orient("left").tickPadding(10),u=a.models.legend().height(30),v=a.models.scatter();return w.dispatch=p,w.margin=function(a){return arguments.length?(b=a,w):b},w.width=function(a){return arguments.length?(c=a,w):c},w.height=function(a){return arguments.length?(d=a,w):d},w.forceX=function(a){return arguments.length?(n=a,v.forceX(a),w):n},w.forceY=function(a){return arguments.length?(o=a,v.forceY(a),w):o},w.animate=function(a){return arguments.length?(e=a,w):e},w.xAxis=s,w.yAxis=t,w},a.models.sparkline=function(){function h(d){return d.each(function(d){f.domain(d3.extent(d,function(a){return a.x})).range([0,b-a.left-a.right]),g.domain(d3.extent(d,function(a){return a.y})).range([c-a.top-a.bottom,0]);var h=d3.select(this).selectAll("svg").data([d]),i=h.enter().append("svg").append("g");i.append("g").attr("class","sparkline").attr("transform","translate("+a.left+","+a.top+")").style("stroke",function(a,b){return a.color||e[b*2%20]}),h.attr("width",b).attr("height",c);var j=i.select(".sparkline").selectAll("path").data(function(a){return[a]});j.enter().append("path"),j.exit().remove(),j.attr("d",d3.svg.line().x(function(a){return f(a.x)}).y(function(a){return g(a.y)}));var k=i.select(".sparkline").selectAll("circle.point").data(function(a){return a.filter(function(a){return g.domain().indexOf(a.y)!=-1})});k.enter().append("circle").attr("class","point"),k.exit().remove(),k.attr("cx",function(a){return f(a.x)}).attr("cy",function(a){return g(a.y)}).attr("r",2).style("stroke",function(a,b){return a.y==g.domain()[0]?"#d62728":"#2ca02c"}).style("fill",function(a,b){return a.y==g.domain()[0]?"#d62728":"#2ca02c"})}),h}var a={top:3,right:3,bottom:3,left:3},b=200,c=20,d=!0,e=d3.scale.category20().range(),f=d3.scale.linear(),g=d3.scale.linear();return h.margin=function(b){return arguments.length?(a=b,h):a},h.width=function(a){return arguments.length?(b=a,h):b},h.height=function(a){return arguments.length?(c=a,h):c},h.animate=function(a){return arguments.length?(d=a,h):d},h},a.models.stackedArea=function(){function q(a){return a.each(function(a){var h=JSON.parse(JSON.stringify(a)),m=h.map(function(a){return a.values.map(function(a,b){return{x:f(a,b),y:g(a,b)}})}),q=c-b.left-b.right,r=d-b.top-b.bottom;h=d3.layout.stack().offset(i).order(j).values(function(a){return a.values}).y(g)(h),o.domain(k||d3.extent(d3.merge(m),function(a){return a.x})).range([0,q]),p.domain(l||[0,d3.max(h,function(a){return d3.max(a.values,function(a){return a.y0+a.y})})]).range([r,0]),n.width(q).height(r).xDomain(o.domain()).yDomain(p.domain()).x(f).y(function(a){return a.y+a.y0}).color(a.map(function(a,b){return a.color||e[b%10]}).filter(function(b,c){return!a[c].disabled}));var s=d3.select(this).selectAll("g.d3stackedarea").data([h]),t=s.enter().append("g").attr("class","d3stackedarea").append("g");t.append("g").attr("class","areaWrap"),t.append("g").attr("class","linesWrap");var u=s.select("g").attr("transform","translate("+b.left+","+b.top+")"),v=u.select(".linesWrap").datum(h.filter(function(a){return!a.disabled}));d3.transition(v).call(n);var w=d3.svg.area().x(function(a,b){return o(f(a,b))}).y0(function(a){return p(a.y0)}).y1(function(a){return p(a.y+a.y0)}),z=d3.svg.area().x(function(a,b){return o(f(a,b))}).y0(function(a){return p(a.y0)}).y1(function(a){return p(a.y0)}),A=u.select(".areaWrap").selectAll("path.area").data(function(a){return a});A.enter().append("path").attr("class","area"),d3.transition(A.exit()).attr("d",function(a,b){return z(a.values,b)}).remove(),A.style("fill",function(a,b){return e[b%10]}).style("stroke",function(a,b){return e[b%10]}),d3.transition(A).attr("d",function(a,b){return w(a.values,b)})}),q}var b={top:0,right:0,bottom:0,left:0},c=960,d=500,e=d3.scale.category10().range(),f=function(a){return a.x},g=function(a){return a.y},h="stack",i="zero",j="default",k,l,m=d3.dispatch("tooltipShow","tooltipHide"),n=a.models.line(),o=d3.scale.linear(),p=d3.scale.linear();return q.x=function(a){return arguments.length?(f=d3.functor(a),q):f},q.y=function(a){return arguments.length?(g=d3.functor(a),q):g},q.margin=function(a){return arguments.length?(b=a,q):b},q.width=function(a){return arguments.length?(c=a,q):c},q.height=function(a){return arguments.length?(d=a,q):d},q.color=function(a){return arguments.length?(e=a,q):e},q.offset=function(a){return arguments.length?(i=a,q):i},q.order=function(a){return arguments.length?(j=a,q):j},q.style=function(a){if(!arguments.length)return h;h=a;switch(h){case"stack":i="zero",j="default";break;case"stream":i="wiggle",j="inside-out";break;case"expand":i="expand",j="default"}return q},q.dispatch=m,n.dispatch.on("pointMouseover.tooltip",function(a){m.tooltipShow({point:a.point,series:a.series,pos:[a.pos[0]+b.left,a.pos[1]+b.top],seriesIndex:a.seriesIndex,pointIndex:a.pointIndex})}),n.dispatch.on("pointMouseout.tooltip",function(a){m.tooltipHide(a)}),q},a.models.stackedAreaWithLegend=function(){function r(a){return a.each(function(e){var f=c(),s=d(),t=f-b.left-b.right,u=s-b.top-b.bottom,v=e.filter(function(a){return!a.disabled}).reduce(function(a,b,c){return b.values.forEach(function(b,d){c||(a[d]={x:j(b.x,d),y:0}),a[d].y+=k(b)}),a},[]);h.domain(d3.extent(d3.merge(v),function(a){return a.x})).range([0,t]),i.domain(p.offset()=="zero"?[0,d3.max(v,function(a){return a.y})]:[0,1]).range([u,0]),p.width(t).height(u);var w=d3.select(this).selectAll("g.wrap").data([e]),z=w.enter().append("g").attr("class","wrap d3stackedWithLegend").append("g");z.append("g").attr("class","x axis"),z.append("g").attr("class","y axis"),z.append("g").attr("class","stackedWrap"),z.append("g").attr("class","legendWrap"),z.append("g").attr("class","controlsWrap"),n.dispatch.on("legendClick",function(b,c){b.disabled=!b.disabled,b.disabled?b.values.map(function(a){return a._y=a.y,a.y=0,a}):b.values.map(function(a){return a.y=a._y,a}),e.filter(function(a){return!a.disabled}).length||e.map(function(a){return a.disabled=!1,a.values.map(function(a){return a.y=a._y,a}),a}),a.transition().call(r)}),o.dispatch.on("legendClick",function(b,c){if(!b.disabled)return;q=q.map(function(a){return a.disabled=!0,a}),b.disabled=!1;switch(b.key){case"Stacked":p.style("stack");break;case"Stream":p.style("stream");break;case"Expanded":p.style("expand")}a.transition().call(r)}),p.dispatch.on("tooltipShow",function(a){if(!Math.round(k(a.point)*100))return setTimeout(function(){d3.selectAll(".point.hover").classed("hover",!1)},0),!1;g.tooltipShow({point:a.point,series:a.series,pos:[a.pos[0]+b.left,a.pos[1]+b.top],seriesIndex:a.seriesIndex,pointIndex:a.pointIndex})}),p.dispatch.on("tooltipHide",function(a){g.tooltipHide(a)}),b.top=n.height();var A=w.select("g").attr("transform","translate("+b.left+","+b.top+")");n.width(f/2-b.right),A.select(".legendWrap").datum(e).attr("transform","translate("+(f/2-b.left)+","+ -b.top+")").call(n),o.width(280).color(["#444","#444","#444"]),A.select(".controlsWrap").datum(q).attr("transform","translate(0,"+ -b.top+")").call(o);var B=A.select(".stackedWrap").datum(e);d3.transition(B).call(p),l.domain(h.domain()).range(h.range()).ticks(f/100).tickSize(-u,0),A.select(".x.axis").attr("transform","translate(0,"+u+")"),d3.transition(A.select(".x.axis")).call(l),m.domain(i.domain()).range(i.range()).ticks(p.offset()=="wiggle"?0:s/36).tickSize(-t,0).tickFormat(p.offset()=="zero"?d3.format(",.2f"):d3.format("%")),d3.transition(A.select(".y.axis")).call(m)}),r}var b={top:30,right:20,bottom:50,left:60},c=function(){return 960},d=function(){return 500},e=function(){return 2.5},f=d3.scale.category10().range(),g=d3.dispatch("tooltipShow","tooltipHide"),h=d3.scale.linear(),i=d3.scale.linear(),j=function(a){return a.x},k=function(a){return a.y},l=a.models.axis().scale(h).orient("bottom"),m=a.models.axis().scale(i).orient("left"),n=a.models.legend().height(30),o=a.models.legend().height(30),p=a.models.stackedArea(),q=[{key:"Stacked"},{key:"Stream",disabled:!0},{key:"Expanded",disabled:!0}];return r.dispatch=g,r.x=function(a){return arguments.length?(j=d3.functor(a),p.x(j),r):j},r.y=function(a){return arguments.length?(k=d3.functor(a),p.y(k),r):k},r.margin=function(a){return arguments.length?(b=a,r):b},r.width=function(a){return arguments.length?(c=d3.functor(a),r):c},r.height=function(a){return arguments.length?(d=d3.functor(a),r):d},r.dotRadius=function(a){return arguments.length?(e=d3.functor(a),p.dotRadius=a,r):e},r.stacked=p,r.xAxis=l,r.yAxis=m,r},a.charts.cumulativeLineChartDaily=function(){function h(){return!b||!c.length?h:(d3.select(b).select("svg").datum(c).transition().duration(d).call(f),h)}var b=null,c=[],d=500,e=function(a,b,c,d,e){return"<h3>"+a+"</h3>"+"<p>"+c+" at "+b+"</p>"},f=a.models.cumulativeLine().x(function(a,b){return b}),g=function(c){var d=document.getElementById(b.substr(1)),g=c.pos[0]+d.offsetLeft,h=c.pos[1]+d.offsetTop,i=f.xAxis.tickFormat(),j=f.yAxis.tickFormat(),k=i(f.x()(c,c.pointIndex)),l=j(f.y()(c.point)),m=e(c.series.key,k,l,c,f);a.tooltip.show([g,h],m)};return f.xAxis.tickFormat(function(a){return d3.time.format("%x")(new Date(c[0].values[a].x))}),f.yAxis.tickFormat(d3.format(",.2%")),h.build=function(){return!b||!c.length?h:(a.addGraph({generate:function(){var a=d3.select(b),e=function(){return parseInt(a.style("width"))},g=function(){return parseInt(a.style("height"))},h=a.append("svg");return f.width(e).height(g),h.attr("width",e()).attr("height",g()).datum(c).transition().duration(d).call(f),f},callback:function(c){c.dispatch.on("tooltipShow",g),c.dispatch.on("tooltipHide",a.tooltip.cleanup),window.onresize=function(){d3.select(b+" svg").attr("width",c.width()()).attr("height",c.height()()).call(c)}}}),h)},h.data=function(a){return arguments.length?(c=a,h):c},h.selector=function(a){return arguments.length?(b=a,h):b},h.duration=function(a){return arguments.length?(d=a,h):d},h.tooltip=function(a){return arguments.length?(e=a,h):e},h.xTickFormat=function(a){return arguments.length?(f.xAxis.tickFormat(typeof a=="function"?a:d3.format(a)),h):f.xAxis.tickFormat()},h.yTickFormat=function(a){return arguments.length?(f.yAxis.tickFormat(typeof a=="function"?a:d3.format(a)),h):f.yAxis.tickFormat()},h.xAxisLabel=function(a){return arguments.length?(f.xAxis.axisLabel(a),h):f.xAxis.axisLabel()},h.yAxisLabel=function(a){return arguments.length?(f.yAxis.axisLabel(a),h):f.yAxis.axisLabel()},d3.rebind(h,f,"x","y"),h.graph=f,h},a.charts.line=function(){function h(){return!b||!c.length?h:(d3.select(b).select("svg").datum(c).transition().duration(d).call(f),h)}var b=null,c=[],d=500,e=function(a,b,c,d,e){return"<h3>"+a+"</h3>"+"<p>"+c+" at "+b+"</p>"},f=a.models.lineWithLegend(),g=function(c){var d=document.getElementById(b.substr(1)),g=c.pos[0]+d.offsetLeft,h=c.pos[1]+d.offsetTop,i=f.xAxis.tickFormat(),j=f.yAxis.tickFormat(),k=i(f.x()(c.point)),l=j(f.y()(c.point)),m=e(c.series.key,k,l,c,f);a.tooltip.show([g,h],m)};return f.xAxis.tickFormat(d3.format(",r")),f.yAxis.tickFormat(d3.format(",.2f")),h.build=function(){return!b||!c.length?h:(a.addGraph({generate:function(){var a=d3.select(b),e=function(){return parseInt(a.style("width"))},g=function(){return parseInt(a.style("height"))},h=a.append("svg");return f.width(e).height(g),h.attr("width",e()).attr("height",g()).datum(c).transition().duration(d).call(f),f},callback:function(c){c.dispatch.on("tooltipShow",g),c.dispatch.on("tooltipHide",a.tooltip.cleanup),window.onresize=function(){d3.select(b+" svg").attr("width",c.width()()).attr("height",c.height()()).call(c)}}}),h)},h.data=function(a){return arguments.length?(c=a,h):c},h.selector=function(a){return arguments.length?(b=a,h):b},h.duration=function(a){return arguments.length?(d=a,h):d},h.tooltip=function(a){return arguments.length?(e=a,h):e},h.xTickFormat=function(a){return arguments.length?(f.xAxis.tickFormat(typeof a=="function"?a:d3.format(a)),h):f.xAxis.tickFormat()},h.yTickFormat=function(a){return arguments.length?(f.yAxis.tickFormat(typeof a=="function"?a:d3.format(a)),h):f.yAxis.tickFormat()},h.xAxisLabel=function(a){return arguments.length?(f.xAxis.axisLabel(a),h):f.xAxis.axisLabel()},h.yAxisLabel=function(a){return arguments.length?(f.yAxis.axisLabel(a),h):f.yAxis.axisLabel()},d3.rebind(h,f,"x","y"),h.graph=f,h},a.charts.lineChartDaily=function(){function h(){return!b||!c.length?h:(d3.select(b).select("svg").datum(c).transition().duration(d).call(f),h)}var b=null,c=[],d=500,e=function(a,b,c,d,e){return"<h3>"+a+"</h3>"+"<p>"+c+" at "+b+"</p>"},f=a.models.lineWithLegend().x(function(a,b){return b}),g=function(c){var d=document.getElementById(b.substr(1)),g=c.pos[0]+d.offsetLeft,h=c.pos[1]+d.offsetTop,i=f.xAxis.tickFormat(),j=f.yAxis.tickFormat(),k=i(f.x()(c,c.pointIndex)),l=j(f.y()(c.point)),m=e(c.series.key,k,l,c,f);a.tooltip.show([g,h],m)};return f.xAxis.tickFormat(function(a){return d3.time.format("%x")(new Date(c[0].values[a].x))}),f.yAxis.tickFormat(d3.format(",.2%")),h.build=function(){return!b||!c.length?h:(a.addGraph({generate:function(){var a=d3.select(b),e=function(){return parseInt(a.style("width"))},g=function(){return parseInt(a.style("height"))},h=a.append("svg");return f.width(e).height(g),h.attr("width",e()).attr("height",g()).datum(c).transition().duration(d).call(f),f},callback:function(c){c.dispatch.on("tooltipShow",g),c.dispatch.on("tooltipHide",a.tooltip.cleanup),window.onresize=function(){d3.select(b+" svg").attr("width",c.width()()).attr("height",c.height()()).call(c)}}}),h)},h.data=function(a){return arguments.length?(c=a,h):c},h.selector=function(a){return arguments.length?(b=a,h):b},h.duration=function(a){return arguments.length?(d=a,h):d},h.tooltip=function(a){return arguments.length?(e=a,h):e},h.xTickFormat=function(a){return arguments.length?(f.xAxis.tickFormat(typeof a=="function"?a:d3.format(a)),h):f.xAxis.tickFormat()},h.yTickFormat=function(a){return arguments.length?(f.yAxis.tickFormat(typeof a=="function"?a:d3.format(a)),h):f.yAxis.tickFormat()},h.xAxisLabel=function(a){return arguments.length?(f.xAxis.axisLabel(a),h):f.xAxis.axisLabel()},h.yAxisLabel=function(a){return arguments.length?(f.yAxis.axisLabel(a),h):f.yAxis.axisLabel()},d3.rebind(h,f,"x","y"),h.graph=f,h}})();
\ No newline at end of file
diff --git a/src/models/line.js b/src/models/line.js
index 283e5ca..c6fe6a4 100644
--- a/src/models/line.js
+++ b/src/models/line.js
@@ -220,6 +220,7 @@ nv.models.line = function() {
       clearTimeout(timeoutID);
       timeoutID = setTimeout(updateInteractiveLayer, 750);
 
+      //store old scales for use in transitions on update, to animate from old to new positions
       x0 = x.copy();
       y0 = y.copy();
 
diff --git a/src/models/scatter.js b/src/models/scatter.js
index 1633f7a..458328b 100644
--- a/src/models/scatter.js
+++ b/src/models/scatter.js
@@ -93,7 +93,7 @@ nv.models.scatter = function() {
           return false;
         }
 
-        gEnter.append('g').attr('class', 'point-clips').append('clipPath').attr('id', 'points-clip-' + id);
+        defsEnter.append('clipPath').attr('id', 'points-clip-' + id);
         gEnter.append('g').attr('class', 'point-paths');
 
         var vertices = d3.merge(data.map(function(group, groupIndex) {
@@ -257,7 +257,7 @@ nv.models.scatter = function() {
       clearTimeout(timeoutID);
       timeoutID = setTimeout(updateInteractiveLayer, 750);
 
-      //store old scales for use in transitions on update
+      //store old scales for use in transitions on update, to animate from old to new positions, and sizes
       x0 = x.copy();
       y0 = y.copy();
       z0 = z.copy();