Skip to content

Commit 0d7c6c5

Browse files
mbostockmbostock
committed
Use _ to disambiguate local vs. global d3.
1 parent 2b3abf6 commit 0d7c6c5

31 files changed

Lines changed: 193 additions & 192 deletions

‎test/arrays/max-test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var vows = require("vows"),
2-
d3 = require("../../"),
2+
_ = require("../../"),
33
load = require("../load"),
44
assert = require("../assert");
55

@@ -39,7 +39,7 @@ suite.addBatch({
3939
assert.isUndefined(max([NaN, NaN]));
4040
},
4141
"applies the optional accessor function": function(max) {
42-
assert.equal(max([[1, 2, 3, 4, 5], [2, 4, 6, 8, 10]], function(d) { return d3.min(d); }), 2);
42+
assert.equal(max([[1, 2, 3, 4, 5], [2, 4, 6, 8, 10]], function(d) { return _.min(d); }), 2);
4343
assert.equal(max([1, 2, 3, 4, 5], function(d, i) { return i; }), 4);
4444
}
4545
}

‎test/arrays/min-test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var vows = require("vows"),
2-
d3 = require("../../"),
2+
_ = require("../../"),
33
load = require("../load"),
44
assert = require("../assert");
55

@@ -38,7 +38,7 @@ suite.addBatch({
3838
assert.isUndefined(min([NaN, NaN]));
3939
},
4040
"applies the optional accessor function": function(min) {
41-
assert.equal(min([[1, 2, 3, 4, 5], [2, 4, 6, 8, 10]], function(d) { return d3.max(d); }), 5);
41+
assert.equal(min([[1, 2, 3, 4, 5], [2, 4, 6, 8, 10]], function(d) { return _.max(d); }), 5);
4242
assert.equal(min([1, 2, 3, 4, 5], function(d, i) { return i; }), 0);
4343
}
4444
}

‎test/arrays/nest-test.js‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var vows = require("vows"),
2-
d3 = require("../../"),
2+
_ = require("../../"),
33
load = require("../load"),
44
assert = require("../assert");
55

@@ -13,7 +13,7 @@ suite.addBatch({
1313
.key(function(d) { return d.foo; })
1414
.entries([{foo: 1}, {foo: 1}, {foo: 2}])
1515
.map(function(d) { return d.key; })
16-
.sort(d3.ascending);
16+
.sort(_.ascending);
1717
assert.deepEqual(keys, ["1", "2"]);
1818
},
1919
"each entry is a key-values object, with values in input order": function(nest) {
@@ -27,7 +27,7 @@ suite.addBatch({
2727
},
2828
"keys can be sorted using an optional comparator": function(nest) {
2929
var keys = nest()
30-
.key(function(d) { return d.foo; }).sortKeys(d3.descending)
30+
.key(function(d) { return d.foo; }).sortKeys(_.descending)
3131
.entries([{foo: 1}, {foo: 1}, {foo: 2}])
3232
.map(function(d) { return d.key; });
3333
assert.deepEqual(keys, ["2", "1"]);
@@ -45,7 +45,7 @@ suite.addBatch({
4545
"values can be aggregated using an optional rollup": function(nest) {
4646
var entries = nest()
4747
.key(function(d) { return d.foo; })
48-
.rollup(function(values) { return d3.sum(values, function(d) { return d.bar; }); })
48+
.rollup(function(values) { return _.sum(values, function(d) { return d.bar; }); })
4949
.entries([{foo: 1, bar: 2}, {foo: 1, bar: 0}, {foo: 1, bar: 1}, {foo: 2}]);
5050
assert.deepEqual(entries, [
5151
{key: "1", values: 3},
@@ -54,8 +54,8 @@ suite.addBatch({
5454
},
5555
"multiple key functions can be specified": function(nest) {
5656
var entries = nest()
57-
.key(function(d) { return d[0]; }).sortKeys(d3.ascending)
58-
.key(function(d) { return d[1]; }).sortKeys(d3.ascending)
57+
.key(function(d) { return d[0]; }).sortKeys(_.ascending)
58+
.key(function(d) { return d[1]; }).sortKeys(_.ascending)
5959
.entries([[0, 1], [0, 2], [1, 1], [1, 2], [0, 2]]);
6060
assert.deepEqual(entries, [
6161
{key: "0", values: [
@@ -70,8 +70,8 @@ suite.addBatch({
7070
},
7171
"the rollup function only applies to leaf values": function(nest) {
7272
var entries = nest()
73-
.key(function(d) { return d[0]; }).sortKeys(d3.ascending)
74-
.key(function(d) { return d[1]; }).sortKeys(d3.ascending)
73+
.key(function(d) { return d[0]; }).sortKeys(_.ascending)
74+
.key(function(d) { return d[1]; }).sortKeys(_.ascending)
7575
.rollup(function(values) { return values.length; })
7676
.entries([[0, 1], [0, 2], [1, 1], [1, 2], [0, 2]]);
7777
assert.deepEqual(entries, [
@@ -87,8 +87,8 @@ suite.addBatch({
8787
},
8888
"the value comparator only applies to leaf values": function(nest) {
8989
var entries = nest()
90-
.key(function(d) { return d[0]; }).sortKeys(d3.ascending)
91-
.key(function(d) { return d[1]; }).sortKeys(d3.ascending)
90+
.key(function(d) { return d[0]; }).sortKeys(_.ascending)
91+
.key(function(d) { return d[1]; }).sortKeys(_.ascending)
9292
.sortValues(function(a, b) { return a[2] - b[2]; })
9393
.entries([[0, 1], [0, 2, 1], [1, 1], [1, 2], [0, 2, 0]]);
9494
assert.deepEqual(entries, [
@@ -104,8 +104,8 @@ suite.addBatch({
104104
},
105105
"the key comparator only applies to the last-specified key": function(nest) {
106106
var entries = nest()
107-
.key(function(d) { return d[0]; }).sortKeys(d3.ascending)
108-
.key(function(d) { return d[1]; }).sortKeys(d3.descending)
107+
.key(function(d) { return d[0]; }).sortKeys(_.ascending)
108+
.key(function(d) { return d[1]; }).sortKeys(_.descending)
109109
.entries([[0, 1], [0, 2], [1, 1], [1, 2], [0, 2]]);
110110
assert.deepEqual(entries, [
111111
{key: "0", values: [
@@ -118,8 +118,8 @@ suite.addBatch({
118118
]}
119119
]);
120120
var entries = nest()
121-
.key(function(d) { return d[0]; }).sortKeys(d3.descending)
122-
.key(function(d) { return d[1]; }).sortKeys(d3.ascending)
121+
.key(function(d) { return d[0]; }).sortKeys(_.descending)
122+
.key(function(d) { return d[1]; }).sortKeys(_.ascending)
123123
.entries([[0, 1], [0, 2], [1, 1], [1, 2], [0, 2]]);
124124
assert.deepEqual(entries, [
125125
{key: "1", values: [
@@ -164,7 +164,7 @@ suite.addBatch({
164164
"values can be aggregated using an optional rollup": function(nest) {
165165
var map = nest()
166166
.key(function(d) { return d.foo; })
167-
.rollup(function(values) { return d3.sum(values, function(d) { return d.bar; }); })
167+
.rollup(function(values) { return _.sum(values, function(d) { return d.bar; }); })
168168
.map([{foo: 1, bar: 2}, {foo: 1, bar: 0}, {foo: 1, bar: 1}, {foo: 2}]);
169169
assert.deepEqual(map, {
170170
"1": 3,
@@ -173,8 +173,8 @@ suite.addBatch({
173173
},
174174
"multiple key functions can be specified": function(nest) {
175175
var map = nest()
176-
.key(function(d) { return d[0]; }).sortKeys(d3.ascending)
177-
.key(function(d) { return d[1]; }).sortKeys(d3.ascending)
176+
.key(function(d) { return d[0]; }).sortKeys(_.ascending)
177+
.key(function(d) { return d[1]; }).sortKeys(_.ascending)
178178
.map([[0, 1], [0, 2], [1, 1], [1, 2], [0, 2]]);
179179
assert.deepEqual(map, {
180180
"0": {
@@ -189,8 +189,8 @@ suite.addBatch({
189189
},
190190
"the rollup function only applies to leaf values": function(nest) {
191191
var map = nest()
192-
.key(function(d) { return d[0]; }).sortKeys(d3.ascending)
193-
.key(function(d) { return d[1]; }).sortKeys(d3.ascending)
192+
.key(function(d) { return d[0]; }).sortKeys(_.ascending)
193+
.key(function(d) { return d[1]; }).sortKeys(_.ascending)
194194
.rollup(function(values) { return values.length; })
195195
.map([[0, 1], [0, 2], [1, 1], [1, 2], [0, 2]]);
196196
assert.deepEqual(map, {
@@ -206,8 +206,8 @@ suite.addBatch({
206206
},
207207
"the value comparator only applies to leaf values": function(nest) {
208208
var map = nest()
209-
.key(function(d) { return d[0]; }).sortKeys(d3.ascending)
210-
.key(function(d) { return d[1]; }).sortKeys(d3.ascending)
209+
.key(function(d) { return d[0]; }).sortKeys(_.ascending)
210+
.key(function(d) { return d[1]; }).sortKeys(_.ascending)
211211
.sortValues(function(a, b) { return a[2] - b[2]; })
212212
.map([[0, 1], [0, 2, 1], [1, 1], [1, 2], [0, 2, 0]]);
213213
assert.deepEqual(map, {
@@ -234,7 +234,7 @@ suite.addBatch({
234234
"a custom map implementation can be specified": function(nest) {
235235
var map = nest()
236236
.key(String)
237-
.map(["hasOwnProperty", "__proto__"], d3.map);
237+
.map(["hasOwnProperty", "__proto__"], _.map);
238238
assert.deepEqual(map.entries(), [
239239
{key: "hasOwnProperty", value: ["hasOwnProperty"]},
240240
{key: "__proto__", value: ["__proto__"]}
@@ -244,7 +244,7 @@ suite.addBatch({
244244
var map = nest()
245245
.key(function(d) { return d.foo; })
246246
.key(function(d) { return d.bar; })
247-
.map([{foo: 42, bar: "red"}], d3.map);
247+
.map([{foo: 42, bar: "red"}], _.map);
248248
assert.deepEqual(map.keys(), ["42"]);
249249
assert.deepEqual(map.get("42").keys(), ["red"]);
250250
assert.deepEqual(map.get("42").values(), [[{foo: 42, bar: "red"}]]);

‎test/arrays/set-test.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var vows = require("vows"),
2-
d3 = require("../../"),
2+
_ = require("../../"),
33
load = require("../load"),
44
assert = require("assert");
55

@@ -36,19 +36,19 @@ suite.addBatch({
3636
},
3737
"values are returned in arbitrary order": function(set) {
3838
var s = set(["foo", "bar"]);
39-
assert.deepEqual(s.values().sort(d3.ascending), ["bar", "foo"]);
39+
assert.deepEqual(s.values().sort(_.ascending), ["bar", "foo"]);
4040
var s = set(["bar", "foo"]);
41-
assert.deepEqual(s.values().sort(d3.ascending), ["bar", "foo"]);
41+
assert.deepEqual(s.values().sort(_.ascending), ["bar", "foo"]);
4242
},
4343
"observes changes via add and remove": function(set) {
4444
var s = set(["foo", "bar"]);
45-
assert.deepEqual(s.values().sort(d3.ascending), ["bar", "foo"]);
45+
assert.deepEqual(s.values().sort(_.ascending), ["bar", "foo"]);
4646
s.remove("foo");
4747
assert.deepEqual(s.values(), ["bar"]);
4848
s.add("bar");
4949
assert.deepEqual(s.values(), ["bar"]);
5050
s.add("foo");
51-
assert.deepEqual(s.values().sort(d3.ascending), ["bar", "foo"]);
51+
assert.deepEqual(s.values().sort(_.ascending), ["bar", "foo"]);
5252
s.remove("bar");
5353
assert.deepEqual(s.values(), ["foo"]);
5454
s.remove("foo");

‎test/color/hcl-test.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var vows = require("vows"),
2-
d3 = require("../../"),
2+
_ = require("../../"),
33
load = require("../load"),
44
assert = require("../assert");
55

@@ -46,7 +46,7 @@ suite.addBatch({
4646
assertHclEqual(hcl("rgb(102, 102, 0)"), 102.85124420310271, 49.44871600399321, 41.73251953866431);
4747
},
4848
"can convert from RGB": function(hcl) {
49-
assertHclEqual(hcl(d3.rgb(12, 34, 56)), -89.58282792342067, 16.833655998102003, 12.65624852526134);
49+
assertHclEqual(hcl(_.rgb(12, 34, 56)), -89.58282792342067, 16.833655998102003, 12.65624852526134);
5050
},
5151
"can convert from HSL": function(hcl) {
5252
assertHclEqual(hcl(hcl(20, .8, .3)), 20, 0.8, 0.3);
@@ -67,13 +67,13 @@ suite.addBatch({
6767
assert.strictEqual(hcl(hcl(60, -4, 32)) + "", "#454c51");
6868
},
6969
"roundtrip to HSL is idempotent": function(hcl) {
70-
assert.hslEqual(d3.hsl(hcl("steelblue")), d3.hsl("steelblue"));
70+
assert.hslEqual(_.hsl(hcl("steelblue")), _.hsl("steelblue"));
7171
},
7272
"roundtrip to RGB is idempotent": function(hcl) {
73-
assert.hslEqual(d3.rgb(hcl("steelblue")), d3.rgb("steelblue"));
73+
assert.hslEqual(_.rgb(hcl("steelblue")), _.rgb("steelblue"));
7474
},
7575
"roundtrip to Lab is idempotent": function(hcl) {
76-
assert.hslEqual(d3.lab(hcl("steelblue")), d3.lab("steelblue"));
76+
assert.hslEqual(_.lab(hcl("steelblue")), _.lab("steelblue"));
7777
}
7878
}
7979
});

‎test/color/hsl-test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var vows = require("vows"),
2-
d3 = require("../../"),
2+
_ = require("../../"),
33
load = require("../load"),
44
assert = require("../assert");
55

@@ -49,7 +49,7 @@ suite.addBatch({
4949
assert.hslEqual(hsl("rgb(102, 102, 0)"), 60, 1, .2);
5050
},
5151
"can convert from RGB": function(hsl) {
52-
assert.hslEqual(hsl(d3.rgb(12, 34, 56)), 210, .647058, .133333);
52+
assert.hslEqual(hsl(_.rgb(12, 34, 56)), 210, .647058, .133333);
5353
},
5454
"can convert from HSL": function(hsl) {
5555
assert.hslEqual(hsl(hsl(20, .8, .3)), 20, .8, .3);

‎test/color/lab-test.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var vows = require("vows"),
2-
d3 = require("../../"),
2+
_ = require("../../"),
33
load = require("../load"),
44
assert = require("../assert");
55

@@ -46,7 +46,7 @@ suite.addBatch({
4646
assertLabEqual(lab("rgb(102, 102, 0)"), 41.73251953866431, -10.998411255098816, 48.21006600604577);
4747
},
4848
"can convert from RGB": function(lab) {
49-
assertLabEqual(lab(d3.rgb(12, 34, 56)), 12.65624852526134, 0.12256520883417721, -16.833209795877284);
49+
assertLabEqual(lab(_.rgb(12, 34, 56)), 12.65624852526134, 0.12256520883417721, -16.833209795877284);
5050
},
5151
"can convert from HSL": function(lab) {
5252
assertLabEqual(lab(lab(20, .8, .3)), 20, 0.8, 0.3);
@@ -67,13 +67,13 @@ suite.addBatch({
6767
assert.strictEqual(lab(lab(60, -4, -32)) + "", "#5d95c8");
6868
},
6969
"roundtrip to HSL is idempotent": function(lab) {
70-
assert.hslEqual(d3.hsl(lab("steelblue")), d3.hsl("steelblue"));
70+
assert.hslEqual(_.hsl(lab("steelblue")), _.hsl("steelblue"));
7171
},
7272
"roundtrip to RGB is idempotent": function(lab) {
73-
assert.hslEqual(d3.rgb(lab("steelblue")), d3.rgb("steelblue"));
73+
assert.hslEqual(_.rgb(lab("steelblue")), _.rgb("steelblue"));
7474
},
7575
"roundtrip to HCL is idempotent": function(lab) {
76-
assert.hslEqual(d3.hcl(lab("steelblue")), d3.hcl("steelblue"));
76+
assert.hslEqual(_.hcl(lab("steelblue")), _.hcl("steelblue"));
7777
}
7878
}
7979
});

‎test/color/rgb-test.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var vows = require("vows"),
2-
d3 = require("../../"),
2+
_ = require("../../"),
33
load = require("../load"),
44
assert = require("../assert");
55

@@ -60,7 +60,7 @@ suite.addBatch({
6060
assert.rgbEqual(rgb(rgb(12, 34, 56)), 12, 34, 56);
6161
},
6262
"can convert from HSL": function(rgb) {
63-
assert.rgbEqual(rgb(d3.hsl(0, 1, .5)), 255, 0, 0);
63+
assert.rgbEqual(rgb(_.hsl(0, 1, .5)), 255, 0, 0);
6464
},
6565
"can convert to HSL": function(rgb) {
6666
assert.hslEqual(rgb("red").hsl(), 0, 1, .5);
@@ -83,7 +83,7 @@ suite.addBatch({
8383
assert.strictEqual(rgb("hsl(60, 100%, 20%)") + "", "#666600");
8484
assert.strictEqual(rgb("rgb(12, 34, 56)") + "", "#0c2238");
8585
assert.strictEqual(rgb(rgb(12, 34, 56)) + "", "#0c2238");
86-
assert.strictEqual(rgb(d3.hsl(60, 1, .2)) + "", "#666600");
86+
assert.strictEqual(rgb(_.hsl(60, 1, .2)) + "", "#666600");
8787
}
8888
}
8989
});

‎test/geo/area-benchmark.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
var d3 = require("../../"),
2-
formatNumber = d3.format(",.02r"),
1+
var d3 = require("../../");
2+
3+
var formatNumber = d3.format(",.02r"),
34
o = d3.geo.circle().angle(30).precision(.1)(),
45
n = 1e3,
56
then = Date.now();

0 commit comments

Comments
 (0)