Skip to content

Commit eb38418

Browse files
committed
Revert "Define rangeBand in context of rangePoints."
This reverts commit b7f5f30, which broke the behavior of the axis component for ordinal scales by changing the meaning of rangeBand.
1 parent cf4c17a commit eb38418

File tree

7 files changed

+25
-16
lines changed

7 files changed

+25
-16
lines changed

component.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "d3",
3-
"version": "3.1.8",
3+
"version": "3.1.9",
44
"main": "index-browserify.js",
55
"scripts": [
66
"index-browserify.js",

d3.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
d3 = function() {
22
var d3 = {
3-
version: "3.1.8"
3+
version: "3.1.9"
44
};
55
if (!Date.now) Date.now = function() {
66
return +new Date();
@@ -6790,7 +6790,7 @@ d3 = function() {
67906790
if (arguments.length < 2) padding = 0;
67916791
var start = x[0], stop = x[1], step = (stop - start) / (Math.max(1, domain.length - 1) + padding);
67926792
range = steps(domain.length < 2 ? (start + stop) / 2 : start + step * padding / 2, step);
6793-
rangeBand = Math.abs(step);
6793+
rangeBand = 0;
67946794
ranger = {
67956795
t: "rangePoints",
67966796
a: arguments

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.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "d3",
3-
"version": "3.1.8",
3+
"version": "3.1.9",
44
"description": "A small, free JavaScript library for manipulating documents based on data.",
55
"keywords": [
66
"dom",

src/scale/ordinal.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ function d3_scale_ordinal(domain, ranger) {
4242
stop = x[1],
4343
step = (stop - start) / (Math.max(1, domain.length - 1) + padding);
4444
range = steps(domain.length < 2 ? (start + stop) / 2 : start + step * padding / 2, step);
45-
rangeBand = Math.abs(step);
45+
rangeBand = 0;
4646
ranger = {t: "rangePoints", a: arguments};
4747
return scale;
4848
};

src/start.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
d3 = (function(){
2-
var d3 = {version: "3.1.8"}; // semver
2+
var d3 = {version: "3.1.9"}; // semver

test/scale/ordinal-test.js

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -109,29 +109,38 @@ suite.addBatch({
109109
"computes discrete points in a continuous range": function(ordinal) {
110110
var x = ordinal().domain(["a", "b", "c"]).rangePoints([0, 120]);
111111
assert.deepEqual(x.range(), [0, 60, 120]);
112-
assert.equal(x.rangeBand(), 60);
113112
var x = ordinal().domain(["a", "b", "c"]).rangePoints([0, 120], 1);
114113
assert.deepEqual(x.range(), [20, 60, 100]);
115-
assert.equal(x.rangeBand(), 40);
116114
var x = ordinal().domain(["a", "b", "c"]).rangePoints([0, 120], 2);
117115
assert.deepEqual(x.range(), [30, 60, 90]);
118-
assert.equal(x.rangeBand(), 30);
119116
},
120117
"correctly handles singleton domains": function(ordinal) {
121118
var x = ordinal().domain(["a"]).rangePoints([0, 120]);
122119
assert.deepEqual(x.range(), [60]);
123-
assert.equal(x.rangeBand(), 120);
124120
},
125121
"can be set to a descending range": function(ordinal) {
126122
var x = ordinal().domain(["a", "b", "c"]).rangePoints([120, 0]);
127123
assert.deepEqual(x.range(), [120, 60,0]);
128-
assert.equal(x.rangeBand(), 60);
129124
var x = ordinal().domain(["a", "b", "c"]).rangePoints([120, 0], 1);
130125
assert.deepEqual(x.range(), [100, 60, 20]);
131-
assert.equal(x.rangeBand(), 40);
132126
var x = ordinal().domain(["a", "b", "c"]).rangePoints([120, 0], 2);
133127
assert.deepEqual(x.range(), [90, 60, 30]);
134-
assert.equal(x.rangeBand(), 30);
128+
},
129+
"has a rangeBand of zero": function(ordinal) {
130+
var x = ordinal().domain(["a", "b", "c"]).rangePoints([0, 120]);
131+
assert.equal(x.rangeBand(), 0);
132+
var x = ordinal().domain(["a", "b", "c"]).rangePoints([0, 120], 1);
133+
assert.equal(x.rangeBand(), 0);
134+
var x = ordinal().domain(["a", "b", "c"]).rangePoints([0, 120], 2);
135+
assert.equal(x.rangeBand(), 0);
136+
var x = ordinal().domain(["a"]).rangePoints([0, 120]);
137+
assert.equal(x.rangeBand(), 0);
138+
var x = ordinal().domain(["a", "b", "c"]).rangePoints([120, 0]);
139+
assert.equal(x.rangeBand(), 0);
140+
var x = ordinal().domain(["a", "b", "c"]).rangePoints([120, 0], 1);
141+
assert.equal(x.rangeBand(), 0);
142+
var x = ordinal().domain(["a", "b", "c"]).rangePoints([120, 0], 2);
143+
assert.equal(x.rangeBand(), 0);
135144
}
136145
},
137146

@@ -244,14 +253,14 @@ suite.addBatch({
244253
x.rangePoints([1, 2]);
245254
assert.inDelta(x(0), 1, 1e-6);
246255
assert.inDelta(x(1), 2, 1e-6);
247-
assert.inDelta(x.rangeBand(), 1, 1e-6);
256+
assert.inDelta(x.rangeBand(), 0, 1e-6);
248257
assert.inDelta(y(0), 1/11, 1e-6);
249258
assert.inDelta(y(1), 6/11, 1e-6);
250259
assert.inDelta(y.rangeBand(), 4/11, 1e-6);
251260
y.rangeBands([0, 1]);
252261
assert.inDelta(x(0), 1, 1e-6);
253262
assert.inDelta(x(1), 2, 1e-6);
254-
assert.inDelta(x.rangeBand(), 1, 1e-6);
263+
assert.inDelta(x.rangeBand(), 0, 1e-6);
255264
assert.inDelta(y(0), 0, 1e-6);
256265
assert.inDelta(y(1), 1/2, 1e-6);
257266
assert.inDelta(y.rangeBand(), 1/2, 1e-6);

0 commit comments

Comments
 (0)