Merge branch 'test'

flyingoctopus · Aug 17, 2011 · b7fb05a · b7fb05a
2 parents ae4306e + 00d8bf7
commit b7fb05a
Show file tree

Hide file tree

Showing 46 changed files with 1,499 additions and 3,457 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "lib/uglify-js"]
+	path = lib/uglify-js
+	url = git://github.com/mishoo/UglifyJS.git
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 JS_COMPILER = \
-	./lib/uglifyjs/bin/uglifyjs
+	./lib/uglify-js/bin/uglifyjs
 
 all: \
 	d3.js \

diff --git a/d3.geom.min.js b/d3.geom.min.js
diff --git a/d3.js b/d3.js
@@ -1,4 +1,4 @@
-(function(){d3 = {version: "1.29.4"}; // semver
+(function(){d3 = {version: "1.29.5"}; // semver
 if (!Date.now) Date.now = function() {
   return +new Date;
 };
@@ -525,7 +525,7 @@ var d3_format_types = {
   f: function(x, p) { return x.toFixed(p); },
   r: function(x, p) {
     var n = 1 + Math.floor(1e-15 + Math.log(x) / Math.LN10);
-    return d3.round(x, p - n).toFixed(Math.max(0, p - n));
+    return d3.round(x, p - n).toFixed(Math.max(0, Math.min(20, p - n)));
   }
 };
 
@@ -1963,7 +1963,7 @@ function d3_transition(groups) {
         delay[++k] = delayMin;
       });
     }
-    d3_timer(step, delayMin);
+    d3.timer(step, delayMin);
     return transition;
   };
 
@@ -2083,17 +2083,14 @@ var d3_timer_queue = null,
     d3_timer_timeout; // is a timeout active?
 
 // The timer will continue to fire until callback returns true.
-d3.timer = function(callback) {
+d3.timer = function(callback, delay) {
-  d3_timer(callback, 0);
-};
-
-function d3_timer(callback, delay) {
   var now = Date.now(),
       found = false,
       t0,
       t1 = d3_timer_queue;
 
-  if (!isFinite(delay)) return;
+  if (arguments.length < 2) delay = 0;
+  else if (!isFinite(delay)) return;
 
   // See if the callback's already in the queue.
   while (t1) {
@@ -2130,7 +2127,7 @@ function d3_timer_step() {
 
   while (t1) {
     elapsed = now - t1.then;
-    if (elapsed > t1.delay) t1.flush = t1.callback(elapsed);
+    if (elapsed >= t1.delay) t1.flush = t1.callback(elapsed);
     t1 = t1.next;
   }
 
@@ -2653,8 +2650,8 @@ d3.scale.quantize = function() {
 
   scale.domain = function(x) {
     if (!arguments.length) return [x0, x1];
-    x0 = x[0];
+    x0 = +x[0];
-    x1 = x[1];
+    x1 = +x[x.length - 1];
     kx = range.length / (x1 - x0);
     return scale;
   };
@@ -2681,7 +2678,7 @@ d3.svg.arc = function() {
         r1 = outerRadius.apply(this, arguments),
         a0 = startAngle.apply(this, arguments) + d3_svg_arcOffset,
         a1 = endAngle.apply(this, arguments) + d3_svg_arcOffset,
-        da = a1 - a0,
+        da = (a1 < a0 && (da = a0, a0 = a1, a1 = da), a1 - a0),
         df = da < Math.PI ? "0" : "1",
         c0 = Math.cos(a0),
         s0 = Math.sin(a0),

diff --git a/d3.min.js b/d3.min.js
diff --git a/examples/data/sample.csv b/examples/data/sample.csv
@@ -0,0 +1,2 @@
+Hello,World
+42,"""fish"""
diff --git a/examples/data/sample.html b/examples/data/sample.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<html>
+  <body>
+    <h1>Hello &amp; world!</h1>
+</html>
diff --git a/examples/data/sample.json b/examples/data/sample.json
@@ -0,0 +1 @@
+[{"Hello":42,"World":"\"fish\""}]
diff --git a/examples/data/sample.txt b/examples/data/sample.txt
@@ -0,0 +1 @@
+Hello, world!
diff --git a/examples/data/sample.xml b/examples/data/sample.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<hello>
+  <world name="Earth"/>
+</hello>
diff --git a/lib/uglify-js b/lib/uglify-js
diff --git a/lib/uglifyjs/LICENSE b/lib/uglifyjs/LICENSE
diff --git a/lib/uglifyjs/README.md b/lib/uglifyjs/README.md