Skip to content

Commit c7c9e7f

Browse files
NelsonMinarNelsonMinar
committed
rename clamped() method to clamp()
1 parent 2548d4f commit c7c9e7f

9 files changed

Lines changed: 33 additions & 22 deletions

File tree

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
JS_COMPILER = \
2-
./lib/uglifyjs/bin/uglifyjs
2+
uglifyjs
33

44
all: \
55
d3.js \

‎d3.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1950,21 +1950,21 @@ d3.scale.linear = function() {
19501950
ky = 1, // (x1 - x0) / (y1 - y0)
19511951
interpolate = d3.interpolate,
19521952
i = interpolate(y0, y1),
1953-
clamp = false;
1953+
clamped = false;
19541954

19551955
function scale(x) {
19561956
x = (x - x0) * kx;
1957-
return i(clamp ? Math.max(0, Math.min(1, x)) : x);
1957+
return i(clamped ? Math.max(0, Math.min(1, x)) : x);
19581958
}
19591959

19601960
// Note: requires range is coercible to number!
19611961
scale.invert = function(y) {
19621962
return (y - y0) * ky + x0;
19631963
};
19641964

1965-
scale.clamped = function(x) {
1966-
if (!arguments.length) return clamp;
1967-
clamp = x;
1965+
scale.clamp = function(x) {
1966+
if (!arguments.length) return clamped;
1967+
clamped = x;
19681968
return scale;
19691969
};
19701970

@@ -2053,7 +2053,7 @@ d3.scale.log = function() {
20532053
scale.range = d3.rebind(scale, linear.range);
20542054
scale.rangeRound = d3.rebind(scale, linear.rangeRound);
20552055
scale.interpolate = d3.rebind(scale, linear.interpolate);
2056-
scale.clamped = d3.rebind(scale, linear.clamped);
2056+
scale.clamp = d3.rebind(scale, linear.clamp);
20572057

20582058
scale.ticks = function() {
20592059
var d = linear.domain(),
@@ -2127,7 +2127,7 @@ d3.scale.pow = function() {
21272127
scale.range = d3.rebind(scale, linear.range);
21282128
scale.rangeRound = d3.rebind(scale, linear.rangeRound);
21292129
scale.interpolate = d3.rebind(scale, linear.interpolate);
2130-
scale.clamped = d3.rebind(scale, linear.clamped);
2130+
scale.clamp = d3.rebind(scale, linear.clamp);
21312131
scale.ticks = tick.ticks;
21322132
scale.tickFormat = tick.tickFormat;
21332133

‎src/scale/linear.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ d3.scale.linear = function() {
77
ky = 1, // (x1 - x0) / (y1 - y0)
88
interpolate = d3.interpolate,
99
i = interpolate(y0, y1),
10-
clamp = false;
10+
clamped = false;
1111

1212
function scale(x) {
1313
x = (x - x0) * kx;
14-
return i(clamp ? Math.max(0, Math.min(1, x)) : x);
14+
return i(clamped ? Math.max(0, Math.min(1, x)) : x);
1515
}
1616

1717
// Note: requires range is coercible to number!
1818
scale.invert = function(y) {
1919
return (y - y0) * ky + x0;
2020
};
2121

22-
scale.clamped = function(x) {
23-
if (!arguments.length) return clamp;
24-
clamp = x;
22+
scale.clamp = function(x) {
23+
if (!arguments.length) return clamped;
24+
clamped = x;
2525
return scale;
2626
};
2727

‎src/scale/log.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ d3.scale.log = function() {
2222
scale.range = d3.rebind(scale, linear.range);
2323
scale.rangeRound = d3.rebind(scale, linear.rangeRound);
2424
scale.interpolate = d3.rebind(scale, linear.interpolate);
25-
scale.clamped = d3.rebind(scale, linear.clamped);
25+
scale.clamp = d3.rebind(scale, linear.clamp);
2626

2727
scale.ticks = function() {
2828
var d = linear.domain(),

‎src/scale/pow.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ d3.scale.pow = function() {
2626
scale.range = d3.rebind(scale, linear.range);
2727
scale.rangeRound = d3.rebind(scale, linear.rangeRound);
2828
scale.interpolate = d3.rebind(scale, linear.interpolate);
29-
scale.clamped = d3.rebind(scale, linear.clamped);
29+
scale.clamp = d3.rebind(scale, linear.clamp);
3030
scale.ticks = tick.ticks;
3131
scale.tickFormat = tick.tickFormat;
3232

‎tests/test-scale-linear.js‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,22 @@ console.log(" 5 -> ", x.ticks(5).map(x.tickFormat(5)).join(", "));
7979
console.log(" 10 -> ", x.ticks(10).map(x.tickFormat(10)).join(", "));
8080
console.log("");
8181

82-
var x = d3.scale.linear().clamped(true);
82+
var x = d3.scale.linear().clamp(true);
8383
console.log("domain clamping:")
84-
console.log(" inspection -> ", x.clamped());
84+
console.log(" inspection -> ", x.clamp());
8585
console.log(" under -> ", x(-1));
8686
console.log(" over -> ", x(2));
8787
console.log("");
8888

89-
var x = d3.scale.linear().domain([1, 0]).clamped(true);
89+
var x = d3.scale.linear().domain([1, 0]).clamp(true);
9090
console.log("domain clamping reversed:")
9191
console.log(" under -> ", x(-1));
9292
console.log(" over -> ", x(2));
93-
console.log("");
93+
console.log("");
94+
95+
var x = d3.scale.linear().clamp(false);
96+
console.log("domain unclamping:")
97+
console.log(" under -> ", x(-1));
98+
console.log(" over -> ", x(11));
99+
console.log("");
100+

‎tests/test-scale-linear.out‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,7 @@ domain clamping reversed:
6565
under -> 1
6666
over -> 0
6767

68+
domain unclamping:
69+
under -> -1
70+
over -> 11
71+

‎tests/test-scale-log.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ console.log(" [1, 100] -> ", x.domain([1, 100]).ticks().map(f).join(", "));
7676
console.log(" [-100, -1] -> ", x.domain([-100, -1]).ticks().map(f).join(", "));
7777
console.log("");
7878

79-
var x = d3.scale.log().domain([1, 2]).clamped(true);
79+
var x = d3.scale.log().domain([1, 2]).clamp(true);
8080
console.log("domain clamping:");
8181
console.log(" over -> ", f(x(4)));
8282
console.log(" under -> ", f(x(0)));

‎tests/test-scale-pow.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ console.log(" 1.00 -> ", x(1.00));
5050
console.log(" 2.00 -> ", x(2.00));
5151
console.log("");
5252

53-
var x = d3.scale.pow().exponent(2).domain([1, 2]).range([0, 1]).clamped(true);
53+
var x = d3.scale.pow().exponent(2).domain([1, 2]).range([0, 1]).clamp(true);
5454
console.log("domain clamping:")
5555
console.log(" under -> ", x(-1));
5656
console.log(" over -> ", x(2));
57-
console.log("");
57+
console.log("");

0 commit comments

Comments
 (0)