Skip to content

Commit b7fb05a

Browse files
mbostockmbostock
committed
Merge branch 'test'
2 parents ae4306e + 00d8bf7 commit b7fb05a

46 files changed

Lines changed: 1499 additions & 3457 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "lib/uglify-js"]
2+
path = lib/uglify-js
3+
url = git://github.com/mishoo/UglifyJS.git

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
JS_COMPILER = \
2-
./lib/uglifyjs/bin/uglifyjs
2+
./lib/uglify-js/bin/uglifyjs
33

44
all: \
55
d3.js \

‎d3.geom.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎d3.js‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(function(){d3 = {version: "1.29.4"}; // semver
1+
(function(){d3 = {version: "1.29.5"}; // semver
22
if (!Date.now) Date.now = function() {
33
return +new Date;
44
};
@@ -525,7 +525,7 @@ var d3_format_types = {
525525
f: function(x, p) { return x.toFixed(p); },
526526
r: function(x, p) {
527527
var n = 1 + Math.floor(1e-15 + Math.log(x) / Math.LN10);
528-
return d3.round(x, p - n).toFixed(Math.max(0, p - n));
528+
return d3.round(x, p - n).toFixed(Math.max(0, Math.min(20, p - n)));
529529
}
530530
};
531531

@@ -1963,7 +1963,7 @@ function d3_transition(groups) {
19631963
delay[++k] = delayMin;
19641964
});
19651965
}
1966-
d3_timer(step, delayMin);
1966+
d3.timer(step, delayMin);
19671967
return transition;
19681968
};
19691969

@@ -2083,17 +2083,14 @@ var d3_timer_queue = null,
20832083
d3_timer_timeout; // is a timeout active?
20842084

20852085
// The timer will continue to fire until callback returns true.
2086-
d3.timer = function(callback) {
2087-
d3_timer(callback, 0);
2088-
};
2089-
2090-
function d3_timer(callback, delay) {
2086+
d3.timer = function(callback, delay) {
20912087
var now = Date.now(),
20922088
found = false,
20932089
t0,
20942090
t1 = d3_timer_queue;
20952091

2096-
if (!isFinite(delay)) return;
2092+
if (arguments.length < 2) delay = 0;
2093+
else if (!isFinite(delay)) return;
20972094

20982095
// See if the callback's already in the queue.
20992096
while (t1) {
@@ -2130,7 +2127,7 @@ function d3_timer_step() {
21302127

21312128
while (t1) {
21322129
elapsed = now - t1.then;
2133-
if (elapsed > t1.delay) t1.flush = t1.callback(elapsed);
2130+
if (elapsed >= t1.delay) t1.flush = t1.callback(elapsed);
21342131
t1 = t1.next;
21352132
}
21362133

@@ -2653,8 +2650,8 @@ d3.scale.quantize = function() {
26532650

26542651
scale.domain = function(x) {
26552652
if (!arguments.length) return [x0, x1];
2656-
x0 = x[0];
2657-
x1 = x[1];
2653+
x0 = +x[0];
2654+
x1 = +x[x.length - 1];
26582655
kx = range.length / (x1 - x0);
26592656
return scale;
26602657
};
@@ -2681,7 +2678,7 @@ d3.svg.arc = function() {
26812678
r1 = outerRadius.apply(this, arguments),
26822679
a0 = startAngle.apply(this, arguments) + d3_svg_arcOffset,
26832680
a1 = endAngle.apply(this, arguments) + d3_svg_arcOffset,
2684-
da = a1 - a0,
2681+
da = (a1 < a0 && (da = a0, a0 = a1, a1 = da), a1 - a0),
26852682
df = da < Math.PI ? "0" : "1",
26862683
c0 = Math.cos(a0),
26872684
s0 = Math.sin(a0),

‎d3.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/data/sample.csv‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Hello,World
2+
42,"""fish"""

‎examples/data/sample.html‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<body>
4+
<h1>Hello &amp; world!</h1>
5+
</html>

‎examples/data/sample.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[{"Hello":42,"World":"\"fish\""}]

‎examples/data/sample.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Hello, world!

‎examples/data/sample.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<hello>
3+
<world name="Earth"/>
4+
</hello>

0 commit comments

Comments
 (0)