Merge branch 'clip-zoom-scale' of https://github.com/mgold/d3 into 3.5.7

MaxQuezada · Nov 2, 2015 · 347b1b4 · 347b1b4
2 parents a6f66e9 + 8b37735
commit 347b1b4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/d3.js b/d3.js
@@ -1369,8 +1369,9 @@
  view = {
  x: view.x,
  y: view.y,
- k: +_
+ k: null
  };
+ scaleTo(+_);
  rescale();
  return zoom;
  };