Skip to content

Commit c275dac

Browse files
mbostockmbostock
committed
Update to 2.7.2.
1 parent dfd6487 commit c275dac

25 files changed

Lines changed: 50 additions & 46 deletions

‎_layouts/api.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta http-equiv="content-type" content="text/html;charset=utf-8">
55
<title>d3.js{% if page.title %} ~ {{ page.title }}{% endif %}</title>
6-
<script type="text/javascript" src="../d3.js?2.7.1"></script>
6+
<script type="text/javascript" src="../d3.js?2.7.2"></script>
77
<style type="text/css">
88

99
@import url("../style.css?1.10.0");

‎_layouts/default.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta http-equiv="content-type" content="text/html;charset=utf-8">
55
<title>d3.js{% if page.title %} ~ {{ page.title }}{% endif %}</title>
6-
<script type="text/javascript" src="d3.js?2.7.1"></script>
6+
<script type="text/javascript" src="d3.js?2.7.2"></script>
77
<style type="text/css">
88

99
@import url("style.css?1.10.0");

‎_layouts/ex.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta http-equiv="content-type" content="text/html;charset=utf-8">
55
<title>d3.js{% if page.title %} ~ {{ page.title }}{% endif %}</title>
6-
<script type="text/javascript" src="../d3.js?2.7.1"></script>
6+
<script type="text/javascript" src="../d3.js?2.7.2"></script>
77
<style type="text/css">
88

99
@import url("../style.css?1.10.0");

‎_layouts/tutorial.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta http-equiv="content-type" content="text/html;charset=utf-8">
55
<title>d3.js{% if page.title %} ~ {{ page.title }}{% endif %}</title>
6-
<script type="text/javascript" src="../d3.js?2.7.1"></script>
6+
<script type="text/javascript" src="../d3.js?2.7.2"></script>
77
<style type="text/css">
88

99
@import url("../style.css?1.10.0");

‎d3.js‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ try {
1010
d3_style_setProperty.call(this, name, value + "", priority);
1111
};
1212
}
13-
d3 = {version: "2.7.1"}; // semver
13+
d3 = {version: "2.7.2"}; // semver
1414
var d3_array = d3_arraySlice; // conversion for NodeLists
1515

1616
function d3_arrayCopy(pseudoarray) {
@@ -1777,7 +1777,7 @@ d3_selectionPrototype.order = function() {
17771777
for (var j = -1, m = this.length; ++j < m;) {
17781778
for (var group = this[j], i = group.length - 1, next = group[i], node; --i >= 0;) {
17791779
if (node = group[i]) {
1780-
if (next) next.parentNode.insertBefore(node, next);
1780+
if (next && next !== node.nextSibling) next.parentNode.insertBefore(node, next);
17811781
next = node;
17821782
}
17831783
}
@@ -2578,11 +2578,11 @@ function d3_scale_log(linear, log) {
25782578
var d3_scale_logFormat = d3.format(".0e");
25792579

25802580
function d3_scale_logp(x) {
2581-
return Math.log(x) / Math.LN10;
2581+
return Math.log(x < 0 ? 0 : x) / Math.LN10;
25822582
}
25832583

25842584
function d3_scale_logn(x) {
2585-
return -Math.log(-x) / Math.LN10;
2585+
return -Math.log(x > 0 ? 0 : -x) / Math.LN10;
25862586
}
25872587

25882588
d3_scale_logp.pow = function(x) {
@@ -3855,31 +3855,43 @@ d3.svg.axis = function() {
38553855
switch (orient) {
38563856
case "bottom": {
38573857
tickTransform = d3_svg_axisX;
3858+
subtickEnter.attr("y2", tickMinorSize);
38583859
subtickUpdate.attr("x2", 0).attr("y2", tickMinorSize);
3860+
tickEnter.select("line").attr("y2", tickMajorSize);
3861+
tickEnter.select("text").attr("y", Math.max(tickMajorSize, 0) + tickPadding);
38593862
tickUpdate.select("line").attr("x2", 0).attr("y2", tickMajorSize);
38603863
tickUpdate.select("text").attr("x", 0).attr("y", Math.max(tickMajorSize, 0) + tickPadding).attr("dy", ".71em").attr("text-anchor", "middle");
38613864
pathUpdate.attr("d", "M" + range[0] + "," + tickEndSize + "V0H" + range[1] + "V" + tickEndSize);
38623865
break;
38633866
}
38643867
case "top": {
38653868
tickTransform = d3_svg_axisX;
3869+
subtickEnter.attr("y2", -tickMinorSize);
38663870
subtickUpdate.attr("x2", 0).attr("y2", -tickMinorSize);
3871+
tickEnter.select("line").attr("y2", -tickMajorSize);
3872+
tickEnter.select("text").attr("y", -(Math.max(tickMajorSize, 0) + tickPadding));
38673873
tickUpdate.select("line").attr("x2", 0).attr("y2", -tickMajorSize);
38683874
tickUpdate.select("text").attr("x", 0).attr("y", -(Math.max(tickMajorSize, 0) + tickPadding)).attr("dy", "0em").attr("text-anchor", "middle");
38693875
pathUpdate.attr("d", "M" + range[0] + "," + -tickEndSize + "V0H" + range[1] + "V" + -tickEndSize);
38703876
break;
38713877
}
38723878
case "left": {
38733879
tickTransform = d3_svg_axisY;
3880+
subtickEnter.attr("x2", -tickMinorSize);
38743881
subtickUpdate.attr("x2", -tickMinorSize).attr("y2", 0);
3882+
tickEnter.select("line").attr("x2", -tickMajorSize);
3883+
tickEnter.select("text").attr("x", -(Math.max(tickMajorSize, 0) + tickPadding));
38753884
tickUpdate.select("line").attr("x2", -tickMajorSize).attr("y2", 0);
38763885
tickUpdate.select("text").attr("x", -(Math.max(tickMajorSize, 0) + tickPadding)).attr("y", 0).attr("dy", ".32em").attr("text-anchor", "end");
38773886
pathUpdate.attr("d", "M" + -tickEndSize + "," + range[0] + "H0V" + range[1] + "H" + -tickEndSize);
38783887
break;
38793888
}
38803889
case "right": {
38813890
tickTransform = d3_svg_axisY;
3891+
subtickEnter.attr("x2", tickMinorSize);
38823892
subtickUpdate.attr("x2", tickMinorSize).attr("y2", 0);
3893+
tickEnter.select("line").attr("x2", tickMajorSize);
3894+
tickEnter.select("text").attr("x", Math.max(tickMajorSize, 0) + tickPadding);
38833895
tickUpdate.select("line").attr("x2", tickMajorSize).attr("y2", 0);
38843896
tickUpdate.select("text").attr("x", Math.max(tickMajorSize, 0) + tickPadding).attr("y", 0).attr("dy", ".32em").attr("text-anchor", "start");
38853897
pathUpdate.attr("d", "M" + tickEndSize + "," + range[0] + "H0V" + range[1] + "H" + tickEndSize);

‎d3.layout.js‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1203,7 +1203,7 @@ function d3_layout_packIntersects(a, b) {
12031203
var dx = b.x - a.x,
12041204
dy = b.y - a.y,
12051205
dr = a.r + b.r;
1206-
return (dr * dr - dx * dx - dy * dy) > .001; // within epsilon
1206+
return dr * dr - dx * dx - dy * dy > .001; // within epsilon
12071207
}
12081208

12091209
function d3_layout_packCircle(nodes) {
@@ -1262,28 +1262,20 @@ function d3_layout_packCircle(nodes) {
12621262
if (isect == 1) {
12631263
for (k = a._pack_prev; k !== j._pack_prev; k = k._pack_prev, s2++) {
12641264
if (d3_layout_packIntersects(k, c)) {
1265-
if (s2 < s1) {
1266-
isect = -1;
1267-
j = k;
1268-
}
12691265
break;
12701266
}
12711267
}
12721268
}
12731269

12741270
// Update node chain.
1275-
if (isect == 0) {
1271+
if (isect) {
1272+
if (s1 < s2 || (s1 == s2 && b.r < a.r)) d3_layout_packSplice(a, b = j);
1273+
else d3_layout_packSplice(a = k, b);
1274+
i--;
1275+
} else {
12761276
d3_layout_packInsert(a, c);
12771277
b = c;
12781278
bound(c);
1279-
} else if (isect > 0) {
1280-
d3_layout_packSplice(a, j);
1281-
b = j;
1282-
i--;
1283-
} else { // isect < 0
1284-
d3_layout_packSplice(j, b);
1285-
a = j;
1286-
i--;
12871279
}
12881280
}
12891281
}

‎d3.layout.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.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.

‎ex/box.markdown‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ title: Box Plots
1313

1414
<link type="text/css" rel="stylesheet" href="button.css"/>
1515
<link type="text/css" rel="stylesheet" href="box.css"/>
16-
<script type="text/javascript" src="../d3.csv.js?2.7.1"> </script>
17-
<script type="text/javascript" src="../d3.chart.js?2.7.1"> </script>
16+
<script type="text/javascript" src="../d3.csv.js?2.7.2"> </script>
17+
<script type="text/javascript" src="../d3.chart.js?2.7.2"> </script>
1818
<script type="text/javascript" src="box.js"> </script>
1919

2020
Data from the [Michelson–Morley experiment](http://en.wikipedia.org/wiki/Michelson%E2%80%93Morley_experiment).

‎ex/bubble.markdown‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ title: Bubble Chart
77

88
<div class="gallery" id="chart"> </div>
99
<link type="text/css" rel="stylesheet" href="bubble.css"/>
10-
<script type="text/javascript" src="../d3.layout.js?2.7.1"> </script>
10+
<script type="text/javascript" src="../d3.layout.js?2.7.2"> </script>
1111
<script type="text/javascript" src="bubble.js"> </script>
1212

1313
Implementation based on work by [Jeff Heer](http://jheer.org/). Data shows the

0 commit comments

Comments
 (0)