Skip to content

Commit 9006592

Browse files
committed
Merge branch 'zoom-extent' of https://github.com/jasondavies/d3 into zoom
2 parents 99963f0 + 14b8d48 commit 9006592

3 files changed

Lines changed: 14 additions & 10 deletions

File tree

d3.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4322,8 +4322,8 @@ d3.behavior.zoom = function() {
43224322
var xyz = [0, 0, 0],
43234323
event = d3.dispatch("zoom"),
43244324
origin = d3_behavior_zoomOrigin([0, 0, 0]),
4325-
extent = [[Infinity, -Infinity],
4326-
[Infinity, -Infinity],
4325+
extent = [[-Infinity, Infinity],
4326+
[-Infinity, Infinity],
43274327
[-Infinity, Infinity]];
43284328

43294329
function zoom() {
@@ -4559,10 +4559,12 @@ function d3_behavior_zoomTo(z, x0, x1) {
45594559

45604560
function d3_behavior_zoomExtentsRange(x, i, k) {
45614561
var range = d3_behavior_zoomExtent[i],
4562+
r0 = range[0],
45624563
r1 = range[1];
45634564
return arguments.length === 3
4564-
? Math.max(r1 * (r1 === -Infinity ? 1 : 1 / k - 1), Math.min(range[0], x / k)) * k
4565-
: Math.max(range[0], Math.min(r1, x));
4565+
? Math.max(r1 * (r1 === Infinity ? -Infinity : 1 / k - 1),
4566+
Math.min(r0 === -Infinity ? Infinity : r0, x / k)) * k
4567+
: Math.max(r0, Math.min(r1, x));
45664568
}
45674569

45684570
function d3_behavior_zoomOrigin(origin) {

0 commit comments

Comments
 (0)