Permalink
Browse files

Merge branch 'test'

  • Loading branch information...
2 parents ae4306e + 00d8bf7 commit b7fb05ab0f54878bf40a163d8c2a2a541454fb5c @mbostock mbostock committed Aug 17, 2011
View
@@ -0,0 +1,3 @@
+[submodule "lib/uglify-js"]
+ path = lib/uglify-js
+ url = git://github.com/mishoo/UglifyJS.git
View
@@ -1,5 +1,5 @@
JS_COMPILER = \
- ./lib/uglifyjs/bin/uglifyjs
+ ./lib/uglify-js/bin/uglifyjs
all: \
d3.js \
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
23 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(callback, 0);
-};
-
-function d3_timer(callback, delay) {
+d3.timer = function(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];
- x1 = x[1];
+ x0 = +x[0];
+ 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),
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -0,0 +1,2 @@
+Hello,World
+42,"""fish"""
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<html>
+ <body>
+ <h1>Hello &amp; world!</h1>
+</html>
@@ -0,0 +1 @@
+[{"Hello":42,"World":"\"fish\""}]
View
@@ -0,0 +1 @@
+Hello, world!
View
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<hello>
+ <world name="Earth"/>
+</hello>
Submodule uglify-js added at b6575e
View
@@ -1,28 +0,0 @@
-Copyright 2010 (c) Mihai Bazon <mihai.bazon@gmail.com>
-Based on parse-js (http://marijn.haverbeke.nl/parse-js/).
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- * Redistributions of source code must retain the above
- copyright notice, this list of conditions and the following
- disclaimer.
-
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials
- provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER “AS IS” AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
View
@@ -1 +0,0 @@
-See <https://github.com/mishoo/UglifyJS>.
Oops, something went wrong.

0 comments on commit b7fb05a

Please sign in to comment.