Update to 2.1.2.

Laurian · Sep 1, 2011 · 78acd14 · 78acd14
1 parent 0aebab1
commit 78acd14
Show file tree

Hide file tree

Showing 23 changed files with 39 additions and 33 deletions.
diff --git a/_layouts/api.html b/_layouts/api.html
@@ -3,7 +3,7 @@
   <head>
     <meta http-equiv="content-type" content="text/html;charset=utf-8">
     <title>d3.js{% if page.title %} ~ {{ page.title }}{% endif %}</title>
-    <script type="text/javascript" src="../d3.js?2.1.1"></script>
+    <script type="text/javascript" src="../d3.js?2.1.2"></script>
     <style type="text/css">
 
 @import url("../style.css?1.10.0");

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -3,7 +3,7 @@
   <head>
     <meta http-equiv="content-type" content="text/html;charset=utf-8">
     <title>d3.js{% if page.title %} ~ {{ page.title }}{% endif %}</title>
-    <script type="text/javascript" src="d3.js?2.1.1"></script>
+    <script type="text/javascript" src="d3.js?2.1.2"></script>
     <style type="text/css">
 
 @import url("style.css?1.10.0");

diff --git a/_layouts/ex.html b/_layouts/ex.html
@@ -3,7 +3,7 @@
   <head>
     <meta http-equiv="content-type" content="text/html;charset=utf-8">
     <title>d3.js{% if page.title %} ~ {{ page.title }}{% endif %}</title>
-    <script type="text/javascript" src="../d3.js?2.1.1"></script>
+    <script type="text/javascript" src="../d3.js?2.1.2"></script>
     <style type="text/css">
 
 @import url("../style.css?1.10.0");

diff --git a/_layouts/tutorial.html b/_layouts/tutorial.html
@@ -3,7 +3,7 @@
   <head>
     <meta http-equiv="content-type" content="text/html;charset=utf-8">
     <title>d3.js{% if page.title %} ~ {{ page.title }}{% endif %}</title>
-    <script type="text/javascript" src="../d3.js?2.1.1"></script>
+    <script type="text/javascript" src="../d3.js?2.1.2"></script>
     <style type="text/css">
 
 @import url("../style.css?1.10.0");

diff --git a/d3.js b/d3.js
@@ -10,7 +10,7 @@ try {
     d3_style_setProperty.call(this, name, value + "", priority);
   };
 }
-d3 = {version: "2.1.1"}; // semver
+d3 = {version: "2.1.2"}; // semver
 var d3_arraySubclass = [].__proto__?
 
 // Until ECMAScript supports array subclassing, prototype injection works well.
@@ -591,9 +591,15 @@ d3.ease = function(name) {
   var i = name.indexOf("-"),
       t = i >= 0 ? name.substring(0, i) : name,
       m = i >= 0 ? name.substring(i + 1) : "in";
-  return d3_ease_mode[m](d3_ease[t].apply(null, Array.prototype.slice.call(arguments, 1)));
+  return d3_ease_clamp(d3_ease_mode[m](d3_ease[t].apply(null, Array.prototype.slice.call(arguments, 1))));
 };
 
+function d3_ease_clamp(f) {
+  return function(t) {
+    return t <= 0 ? 0 : t >= 1 ? 1 : f(t);
+  };
+}
+
 function d3_ease_reverse(f) {
   return function(t) {
     return 1 - f(1 - t);
@@ -1802,15 +1808,15 @@ function d3_transition(groups, id) {
       function tick(elapsed) {
         if (lock.active !== id) return stop();
 
-        var t = Math.min(1, (elapsed - delay) / duration),
+        var t = (elapsed - delay) / duration,
             e = ease(t),
             n = tweened.length;
 
         while (n > 0) {
           tweened[--n].call(node, e);
         }
 
-        if (t === 1) {
+        if (t >= 1) {
           stop();
           d3_transitionInheritId = id;
           event.end.dispatch.call(node, d, i);
@@ -2602,8 +2608,8 @@ d3.svg.arc = function() {
       + "A" + r1 + "," + r1 + " 0 1,1 0," + (-r1)
       + "A" + r1 + "," + r1 + " 0 1,1 0," + r1
       + "M0," + r0
-      + "A" + r0 + "," + r0 + " 0 1,1 0," + (-r0)
-      + "A" + r0 + "," + r0 + " 0 1,1 0," + r0
+      + "A" + r0 + "," + r0 + " 0 1,0 0," + (-r0)
+      + "A" + r0 + "," + r0 + " 0 1,0 0," + r0
       + "Z"
       : "M0," + r1
       + "A" + r1 + "," + r1 + " 0 1,1 0," + (-r1)

diff --git a/d3.min.js b/d3.min.js
diff --git a/ex/box.markdown b/ex/box.markdown
@@ -13,8 +13,8 @@ title: Box Plots
 
 <link type="text/css" rel="stylesheet" href="button.css"/>
 <link type="text/css" rel="stylesheet" href="box.css"/>
-<script type="text/javascript" src="../d3.csv.js?2.1.1"> </script>
-<script type="text/javascript" src="../d3.chart.js?2.1.1"> </script>
+<script type="text/javascript" src="../d3.csv.js?2.1.2"> </script>
+<script type="text/javascript" src="../d3.chart.js?2.1.2"> </script>
 <script type="text/javascript" src="box.js"> </script>
 
 Data from the [Michelson–Morley experiment](http://en.wikipedia.org/wiki/Michelson%E2%80%93Morley_experiment).

diff --git a/ex/bubble.markdown b/ex/bubble.markdown
@@ -7,7 +7,7 @@ title: Bubble Chart
 
 <div class="gallery" id="chart"> </div>
 <link type="text/css" rel="stylesheet" href="bubble.css"/>
-<script type="text/javascript" src="../d3.layout.js?2.1.1"> </script>
+<script type="text/javascript" src="../d3.layout.js?2.1.2"> </script>
 <script type="text/javascript" src="bubble.js"> </script>
 
 Implementation based on work by [Jeff Heer](http://jheer.org/). Data shows the

diff --git a/ex/bullet.markdown b/ex/bullet.markdown
@@ -13,7 +13,7 @@ title: Bullet Charts
 
 <link type="text/css" rel="stylesheet" href="button.css"/>
 <link type="text/css" rel="stylesheet" href="bullet.css"/>
-<script type="text/javascript" src="../d3.chart.js?2.1.1"> </script>
+<script type="text/javascript" src="../d3.chart.js?2.1.2"> </script>
 <script type="text/javascript" src="bullet.js"> </script>
 
 Layout inspired by [Stephen Few](http://www.perceptualedge.com/articles/misc/Bullet_Graph_Design_Spec.pdf).

diff --git a/ex/calendar.markdown b/ex/calendar.markdown
@@ -8,8 +8,8 @@ title: Calendar View
 <div class="gallery" id="chart"> </div>
 <link type="text/css" rel="stylesheet" href="calendar.css"/>
 <link type="text/css" rel="stylesheet" href="colorbrewer.css"/>
-<script type="text/javascript" src="../d3.csv.js?2.1.1"> </script>
-<script type="text/javascript" src="../d3.time.js?2.1.1"> </script>
+<script type="text/javascript" src="../d3.csv.js?2.1.2"> </script>
+<script type="text/javascript" src="../d3.time.js?2.1.2"> </script>
 <script type="text/javascript" src="calendar.js"> </script>
 <script type="text/javascript" src="dji.js"> </script>
 

diff --git a/ex/cartogram.markdown b/ex/cartogram.markdown
@@ -7,8 +7,8 @@ title: Non-Contiguous Cartogram
 
 <div class="gallery" id="chart"> </div>
 <link type="text/css" rel="stylesheet" href="cartogram.css"/>
-<script type="text/javascript" src="../d3.geo.js?2.1.1"> </script>
-<script type="text/javascript" src="../d3.geom.js?2.1.1"> </script>
+<script type="text/javascript" src="../d3.geo.js?2.1.2"> </script>
+<script type="text/javascript" src="../d3.geom.js?2.1.2"> </script>
 <script type="text/javascript" src="cartogram.js"> </script>
 
 Inspired by [Zachary Johnson](http://indiemaps.com/blog/2011/02/noncontiguous-cartograms-in-openlayers-and-polymaps/).

diff --git a/ex/chord.markdown b/ex/chord.markdown
@@ -7,7 +7,7 @@ title: Chord Diagram
 
 <div id="chart"> </div>
 <link type="text/css" rel="stylesheet" href="chord.css"/>
-<script type="text/javascript" src="../d3.layout.js?2.1.1"> </script>
+<script type="text/javascript" src="../d3.layout.js?2.1.2"> </script>
 <script type="text/javascript" src="chord.js"> </script>
 
 Layout inspired by [Martin Krzywinski](http://mkweb.bcgsc.ca/)'s beautiful

diff --git a/ex/choropleth.markdown b/ex/choropleth.markdown
@@ -8,7 +8,7 @@ title: Choropleth
 <div class="gallery" id="chart"> </div>
 <link type="text/css" rel="stylesheet" href="choropleth.css"/>
 <link type="text/css" rel="stylesheet" href="colorbrewer.css"/>
-<script type="text/javascript" src="../d3.geo.js?2.1.1"> </script>
+<script type="text/javascript" src="../d3.geo.js?2.1.2"> </script>
 <script type="text/javascript" src="choropleth.js"> </script>
 
 Choropleth design invented by [Charles Dupin](http://en.wikipedia.org/wiki/Charles_Dupin).

diff --git a/ex/cluster.markdown b/ex/cluster.markdown
@@ -7,7 +7,7 @@ title: Dendrogram
 
 <div class="gallery" id="chart"> </div>
 <link type="text/css" rel="stylesheet" href="cluster.css"/>
-<script type="text/javascript" src="../d3.layout.js?2.1.1"> </script>
+<script type="text/javascript" src="../d3.layout.js?2.1.2"> </script>
 <script type="text/javascript" src="cluster.js"> </script>
 
 Data shows the [Flare](http://flare.prefuse.org/) class hierarchy, courtesy

diff --git a/ex/force.markdown b/ex/force.markdown
@@ -7,8 +7,8 @@ title: Force-Directed Graph
 
 <div class="gallery" id="chart"> </div>
 <link type="text/css" rel="stylesheet" href="force.css"/>
-<script type="text/javascript" src="../d3.layout.js?2.1.1"> </script>
-<script type="text/javascript" src="../d3.geom.js?2.1.1"> </script>
+<script type="text/javascript" src="../d3.layout.js?2.1.2"> </script>
+<script type="text/javascript" src="../d3.geom.js?2.1.2"> </script>
 <script type="text/javascript" src="force.js"> </script>
 
 Layout algorithm inspired by [Tim Dwyer](http://www.csse.monash.edu.au/~tdwyer/) and

diff --git a/ex/pack.markdown b/ex/pack.markdown
@@ -7,7 +7,7 @@ title: Circle Packing
 
 <div class="gallery" id="chart"> </div>
 <link type="text/css" rel="stylesheet" href="pack.css?1"/>
-<script type="text/javascript" src="../d3.layout.js?2.1.1"> </script>
+<script type="text/javascript" src="../d3.layout.js?2.1.2"> </script>
 <script type="text/javascript" src="pack.js"> </script>
 
 Implementation based on work by [Jeff Heer](http://jheer.org/). Data shows the

diff --git a/ex/population.markdown b/ex/population.markdown
@@ -7,7 +7,7 @@ title: Population Pyramid
 
 <div class="gallery" id="chart"> </div>
 <link type="text/css" rel="stylesheet" href="population.css"/>
-<script type="text/javascript" src="../d3.csv.js?2.1.1"> </script>
+<script type="text/javascript" src="../d3.csv.js?2.1.2"> </script>
 <script type="text/javascript" src="population.js"> </script>
 
 Data from the [Minnesota Population Center](http://ipums.org/). Use the arrow

diff --git a/ex/stack.markdown b/ex/stack.markdown
@@ -16,7 +16,7 @@ title: Stacked Bars
 
 <link type="text/css" rel="stylesheet" href="stack.css"/>
 <link type="text/css" rel="stylesheet" href="button.css"/>
-<script type="text/javascript" src="../d3.layout.js?2.1.1"> </script>
+<script type="text/javascript" src="../d3.layout.js?2.1.2"> </script>
 <script type="text/javascript" src="stream_layers.js"> </script>
 <script type="text/javascript" src="stack.js"> </script>
 

diff --git a/ex/stream.markdown b/ex/stream.markdown
@@ -13,7 +13,7 @@ title: Streamgraph
 
 <link type="text/css" rel="stylesheet" href="stream.css"/>
 <link type="text/css" rel="stylesheet" href="button.css"/>
-<script type="text/javascript" src="../d3.layout.js?2.1.1"> </script>
+<script type="text/javascript" src="../d3.layout.js?2.1.2"> </script>
 <script type="text/javascript" src="stream_layers.js"> </script>
 <script type="text/javascript" src="stream.js"> </script>
 

diff --git a/ex/sunburst.markdown b/ex/sunburst.markdown
@@ -15,7 +15,7 @@ title: Sunburst
 </div>
 
 <link type="text/css" rel="stylesheet" href="button.css"/>
-<script type="text/javascript" src="../d3.layout.js?2.1.1"> </script>
+<script type="text/javascript" src="../d3.layout.js?2.1.2"> </script>
 <script type="text/javascript" src="sunburst.js"> </script>
 
 Sunburst design by [John Stasko](http://www.cc.gatech.edu/gvu/ii/sunburst/).

diff --git a/ex/tree.markdown b/ex/tree.markdown
@@ -7,7 +7,7 @@ title: Node-Link Tree
 
 <div class="gallery" id="chart"> </div>
 <link type="text/css" rel="stylesheet" href="tree.css"/>
-<script type="text/javascript" src="../d3.layout.js?2.1.1"> </script>
+<script type="text/javascript" src="../d3.layout.js?2.1.2"> </script>
 <script type="text/javascript" src="tree.js"> </script>
 
 Implementation based on work by [Jeff Heer](http://jheer.org/) and

diff --git a/ex/treemap.markdown b/ex/treemap.markdown
@@ -16,7 +16,7 @@ title: Treemap
 
 <link type="text/css" rel="stylesheet" href="button.css"/>
 <link type="text/css" rel="stylesheet" href="treemap.css"/>
-<script type="text/javascript" src="../d3.layout.js?2.1.1"> </script>
+<script type="text/javascript" src="../d3.layout.js?2.1.2"> </script>
 <script type="text/javascript" src="treemap.js"> </script>
 
 Treemap design invented by [Ben Shneiderman](http://www.cs.umd.edu/~ben/).

diff --git a/ex/voronoi.markdown b/ex/voronoi.markdown
@@ -8,7 +8,7 @@ title: Voronoi Diagram
 <div class="gallery" id="chart"> </div>
 <link type="text/css" rel="stylesheet" href="colorbrewer.css"/>
 <link type="text/css" rel="stylesheet" href="voronoi.css"/>
-<script type="text/javascript" src="../d3.geom.js?2.1.1"> </script>
+<script type="text/javascript" src="../d3.geom.js?2.1.2"> </script>
 <script type="text/javascript" src="voronoi.js"> </script>
 
 Colors by [Cynthia Brewer](http://colorbrewer.org/). Voronoi design