Skip to content

Commit bc410a2

Browse files
mbostockmbostock
committed
Update to 2.2.1.
1 parent e978781 commit bc410a2

23 files changed

Lines changed: 51 additions & 31 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.2.0"></script>
6+
<script type="text/javascript" src="../d3.js?2.2.1"></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.2.0"></script>
6+
<script type="text/javascript" src="d3.js?2.2.1"></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.2.0"></script>
6+
<script type="text/javascript" src="../d3.js?2.2.1"></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.2.0"></script>
6+
<script type="text/javascript" src="../d3.js?2.2.1"></script>
77
<style type="text/css">
88

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

‎d3.js‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,25 @@ try {
1010
d3_style_setProperty.call(this, name, value + "", priority);
1111
};
1212
}
13-
d3 = {version: "2.2.0"}; // semver
13+
d3 = {version: "2.2.1"}; // semver
14+
var d3_array = d3_arraySlice; // conversion for NodeLists
15+
16+
function d3_arrayCopy(pseudoarray) {
17+
var i = -1, n = pseudoarray.length, array = [];
18+
while (++i < n) array.push(pseudoarray[i]);
19+
return array;
20+
}
21+
22+
function d3_arraySlice(pseudoarray) {
23+
return Array.prototype.slice.call(pseudoarray);
24+
}
25+
26+
try {
27+
d3_array(document.documentElement.childNodes)[0].nodeType;
28+
} catch(e) {
29+
d3_array = d3_arrayCopy;
30+
}
31+
1432
var d3_arraySubclass = [].__proto__?
1533

1634
// Until ECMAScript supports array subclassing, prototype injection works well.
@@ -1254,7 +1272,7 @@ d3_selectionPrototype.selectAll = function(selector) {
12541272
for (var j = -1, m = this.length; ++j < m;) {
12551273
for (var group = this[j], i = -1, n = group.length; ++i < n;) {
12561274
if (node = group[i]) {
1257-
subgroups.push(subgroup = selector.call(node, node.__data__, i));
1275+
subgroups.push(subgroup = d3_array(selector.call(node, node.__data__, i)));
12581276
subgroup.parentNode = node;
12591277
}
12601278
}
@@ -1738,16 +1756,18 @@ var d3_selectionRoot = d3_selection([[document]]);
17381756
d3_selectionRoot[0].parentNode = document.documentElement;
17391757

17401758
// TODO fast singleton implementation!
1759+
// TODO select(function)
17411760
d3.select = function(selector) {
17421761
return typeof selector === "string"
17431762
? d3_selectionRoot.select(selector)
17441763
: d3_selection([[selector]]); // assume node
17451764
};
17461765

1766+
// TODO selectAll(function)
17471767
d3.selectAll = function(selector) {
17481768
return typeof selector === "string"
17491769
? d3_selectionRoot.selectAll(selector)
1750-
: d3_selection([selector]); // assume node[]
1770+
: d3_selection([d3_array(selector)]); // assume node[]
17511771
};
17521772
function d3_transition(groups, id) {
17531773
d3_arraySubclass(groups, d3_transitionPrototype);
@@ -3401,7 +3421,7 @@ function d3_svg_mousePoint(container, e) {
34013421
};
34023422
d3.svg.touches = function(container) {
34033423
var touches = d3.event.touches;
3404-
return touches ? Array.prototype.map.call(touches, function(touch) {
3424+
return touches ? d3_array(touches).map(function(touch) {
34053425
var point = d3_svg_mousePoint(container, touch);
34063426
point.identifier = touch.identifier;
34073427
return point;

‎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.2.0"> </script>
17-
<script type="text/javascript" src="../d3.chart.js?2.2.0"> </script>
16+
<script type="text/javascript" src="../d3.csv.js?2.2.1"> </script>
17+
<script type="text/javascript" src="../d3.chart.js?2.2.1"> </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.2.0"> </script>
10+
<script type="text/javascript" src="../d3.layout.js?2.2.1"> </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

‎ex/bullet.markdown‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ title: Bullet Charts
1313

1414
<link type="text/css" rel="stylesheet" href="button.css"/>
1515
<link type="text/css" rel="stylesheet" href="bullet.css"/>
16-
<script type="text/javascript" src="../d3.chart.js?2.2.0"> </script>
16+
<script type="text/javascript" src="../d3.chart.js?2.2.1"> </script>
1717
<script type="text/javascript" src="bullet.js"> </script>
1818

1919
Layout inspired by [Stephen Few](http://www.perceptualedge.com/articles/misc/Bullet_Graph_Design_Spec.pdf).

‎ex/calendar.markdown‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ title: Calendar View
88
<div class="gallery" id="chart"> </div>
99
<link type="text/css" rel="stylesheet" href="calendar.css"/>
1010
<link type="text/css" rel="stylesheet" href="colorbrewer.css"/>
11-
<script type="text/javascript" src="../d3.csv.js?2.2.0"> </script>
12-
<script type="text/javascript" src="../d3.time.js?2.2.0"> </script>
11+
<script type="text/javascript" src="../d3.csv.js?2.2.1"> </script>
12+
<script type="text/javascript" src="../d3.time.js?2.2.1"> </script>
1313
<script type="text/javascript" src="calendar.js"> </script>
1414
<script type="text/javascript" src="dji.js"> </script>
1515

0 commit comments

Comments
 (0)