Skip to content

Commit a4fed02

Browse files
mbostockmbostock
committed
Get most transition tests working again.
1 parent bd09d37 commit a4fed02

21 files changed

Lines changed: 114 additions & 132 deletions

‎src/selection/selection.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ import "call";
4949
import "empty";
5050
import "node";
5151
import "enter";
52+
import "transition";
5253

5354
var d3_selectionRoot = d3_selection([[d3_document]]);
5455

‎src/selection/transition.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import "selection";
2-
import "../transition/transition";
32

43
d3_selectionPrototype.transition = function() {
54
var id = d3_transitionInheritId || ++d3_transitionId,

‎src/transition/index.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
import "../selection/transition";
21
import "transition";

‎test/transition/transition-test-attr.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
require("../env");
2-
31
var assert = require("../assert");
42

53
module.exports = {
6-
topic: function() {
4+
topic: function(d3) {
75
var s = d3.select("body").append("div")
86
.attr("display", "none")
97
.attr("font-size", "20px")

‎test/transition/transition-test-attrTween.js‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
require("../env");
2-
3-
var assert = require("../assert");
1+
var assert = require("../assert"),
2+
interpolateHsl = require("../../").interpolateHsl;
43

54
module.exports = {
6-
topic: function() {
5+
topic: function(d3) {
76
var cb = this.callback,
87
dd = [],
98
ii = [],
@@ -13,7 +12,7 @@ module.exports = {
1312
var s = d3.select("body").html("").append("div").selectAll("div")
1413
.data(["red", "green"])
1514
.enter().append("div")
16-
.attr("color", function(d) { return d3.rgb(d)+""; });
15+
.attr("color", function(d, i) { return i ? "#008000" : "#ff0000"; });
1716

1817
var t = s.transition()
1918
.attrTween("color", tween);
@@ -30,7 +29,7 @@ module.exports = {
3029
value: vv,
3130
context: tt
3231
});
33-
return i && d3.interpolateHsl(v, "blue");
32+
return i && interpolateHsl(v, "blue");
3433
}
3534
},
3635

‎test/transition/transition-test-call.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
require("../env");
2-
31
var assert = require("../assert");
42

53
module.exports = {
6-
topic: function() {
4+
topic: function(d3) {
75
return d3.select("body").append("div").transition();
86
},
97
"calls the function once": function(transition) {

‎test/transition/transition-test-delay.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
require("../env");
2-
31
var assert = require("../assert");
42

53
module.exports = {
6-
topic: function() {
4+
topic: function(d3) {
75
return d3.select("body").html("").selectAll()
86
.data(["foo", "bar"])
97
.enter().append("div")

‎test/transition/transition-test-duration.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
require("../env");
2-
31
var assert = require("../assert");
42

53
module.exports = {
6-
topic: function() {
4+
topic: function(d3) {
75
return d3.select("body").html("").selectAll()
86
.data(["foo", "bar"])
97
.enter().append("div")

‎test/transition/transition-test-each.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
require("../env");
2-
31
var assert = require("../assert");
42

53
module.exports = {
64
"start": {
7-
topic: function() {
5+
topic: function(d3) {
86
var cb = this.callback,
97
div = d3.select("body").html("").selectAll().data(["foo", "bar"]).enter().append("div").attr("class", String),
108
transition = div.transition().delay(350),
@@ -76,7 +74,7 @@ module.exports = {
7674
},
7775

7876
"end": {
79-
topic: function() {
77+
topic: function(d3) {
8078
var cb = this.callback,
8179
div = d3.select("body").html("").selectAll().data(["foo", "bar"]).enter().append("div").attr("class", String),
8280
transition = div.transition().duration(350),

‎test/transition/transition-test-filter.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
require("../env");
2-
3-
var assert = require("../assert");
1+
var assert = require("../assert"),
2+
merge = require("../../").merge;
43

54
var datum = {};
65

76
module.exports = {
8-
topic: function() {
7+
topic: function(d3) {
98
return d3.select("body").html("").selectAll("div")
109
.data([0, 1])
1110
.enter().append("div")
@@ -25,7 +24,7 @@ module.exports = {
2524
assert.isTrue(some[1][0] === span[1][0]);
2625
},
2726
"removes non-matching elements": function(span) {
28-
var some = d3.merge(span.filter(function(d, i) { return d & 1; }));
27+
var some = merge(span.filter(function(d, i) { return d & 1; }));
2928
assert.equal(some.indexOf(span[0][0]), -1);
3029
assert.equal(some.indexOf(span[1][0]), -1);
3130
},
@@ -50,12 +49,13 @@ module.exports = {
5049
span.filter(function(d, i) { return d & 1; }).each(function(d, i) { indexes.push(i); });
5150
assert.deepEqual(indexes, [0, 0]);
5251
},
53-
"ignores null nodes": function() {
54-
var span = d3.selectAll("span");
52+
"ignores null nodes": function(span) {
53+
var node = span[0][1];
5554
span[0][1] = null;
5655
var some = span.filter(function(d, i) { return d & 1; });
5756
assert.isTrue(some[0][0] === span[0][3]);
58-
assert.equal(some.length, 1);
57+
assert.equal(some.length, 2);
58+
span[0][1] = node;
5959
},
6060
"can be specified as a selector": function(span) {
6161
var some = span.filter(".foo");

0 commit comments

Comments
 (0)