Skip to content

Commit baab7b4

Browse files
mbostockmbostock
committed
Update to 2.4.6.
1 parent f05418a commit baab7b4

25 files changed

Lines changed: 32 additions & 30 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.4.5"></script>
6+
<script type="text/javascript" src="../d3.js?2.4.6"></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.4.5"></script>
6+
<script type="text/javascript" src="d3.js?2.4.6"></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.4.5"></script>
6+
<script type="text/javascript" src="../d3.js?2.4.6"></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.4.5"></script>
6+
<script type="text/javascript" src="../d3.js?2.4.6"></script>
77
<style type="text/css">
88

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

‎d3.js‎

Lines changed: 1 addition & 1 deletion
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.4.5"}; // semver
13+
d3 = {version: "2.4.6"}; // semver
1414
var d3_array = d3_arraySlice; // conversion for NodeLists
1515

1616
function d3_arrayCopy(pseudoarray) {

‎d3.layout.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ d3.layout.chord = function() {
116116
x = 0, i = -1; while (++i < n) {
117117
x0 = x, j = -1; while (++j < n) {
118118
var di = groupIndex[i],
119-
dj = subgroupIndex[i][j],
119+
dj = subgroupIndex[di][j],
120120
v = matrix[di][dj];
121121
subgroups[di + "-" + dj] = {
122122
index: di,
@@ -153,7 +153,9 @@ d3.layout.chord = function() {
153153

154154
function resort() {
155155
chords.sort(function(a, b) {
156-
return sortChords(a.target.value, b.target.value);
156+
return sortChords(
157+
(a.source.value + a.target.value) / 2,
158+
(b.source.value + b.target.value) / 2);
157159
});
158160
}
159161

‎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: 1 addition & 1 deletion
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.4.5"> </script>
17-
<script type="text/javascript" src="../d3.chart.js?2.4.5"> </script>
16+
<script type="text/javascript" src="../d3.csv.js?2.4.6"> </script>
17+
<script type="text/javascript" src="../d3.chart.js?2.4.6"> </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.4.5"> </script>
10+
<script type="text/javascript" src="../d3.layout.js?2.4.6"> </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)