Back-port d3/d3-scale#9 fix.

zcliu · Dec 17, 2015 · 78ce531 · 78ce531
1 parent e7652fc
commit 78ce531
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 12 deletions.
diff --git a/component.json b/component.json
@@ -10,7 +10,7 @@
     "animation",
     "canvas"
   ],
-  "version": "3.5.11",
+  "version": "3.5.12",
   "main": "d3.js",
   "scripts": [
     "d3.js"

diff --git a/d3.js b/d3.js
@@ -1,6 +1,6 @@
 !function() {
   var d3 = {
-    version: "3.5.11"
+    version: "3.5.12"
   };
   var d3_arraySlice = [].slice, d3_array = function(list) {
     return d3_arraySlice.call(list);
@@ -7565,7 +7565,9 @@
     return d3.rebind(scale, linear, "range", "rangeRound", "interpolate", "clamp");
   }
   function d3_scale_linearNice(domain, m) {
-    return d3_scale_nice(domain, d3_scale_niceStep(d3_scale_linearTickRange(domain, m)[2]));
+    d3_scale_nice(domain, d3_scale_niceStep(d3_scale_linearTickRange(domain, m)[2]));
+    d3_scale_nice(domain, d3_scale_niceStep(d3_scale_linearTickRange(domain, m)[2]));
+    return domain;
   }
   function d3_scale_linearTickRange(domain, m) {
     if (m == null) m = 10;

diff --git a/d3.min.js b/d3.min.js
diff --git a/package.js b/package.js
@@ -3,7 +3,7 @@
 Package.describe({
   name: "d3js:d3", // http://atmospherejs.com/d3js/d3
   summary: "D3 (official): A JavaScript visualization library for HTML and SVG.",
-  version: "3.5.11",
+  version: "3.5.12",
   git: "https://github.com/mbostock/d3.git"
 });
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d3",
-  "version": "3.5.11",
+  "version": "3.5.12",
   "description": "A JavaScript visualization library for HTML and SVG.",
   "keywords": [
     "dom",

diff --git a/src/scale/linear.js b/src/scale/linear.js
@@ -88,7 +88,9 @@ function d3_scale_linearRebind(scale, linear) {
 }
 
 function d3_scale_linearNice(domain, m) {
-  return d3_scale_nice(domain, d3_scale_niceStep(d3_scale_linearTickRange(domain, m)[2]));
+  d3_scale_nice(domain, d3_scale_niceStep(d3_scale_linearTickRange(domain, m)[2]));
+  d3_scale_nice(domain, d3_scale_niceStep(d3_scale_linearTickRange(domain, m)[2]));
+  return domain;
 }
 
 function d3_scale_linearTickRange(domain, m) {

diff --git a/src/start.js b/src/start.js
@@ -1,2 +1,2 @@
 !function(){
-  var d3 = {version: "3.5.11"}; // semver
+  var d3 = {version: "3.5.12"}; // semver
diff --git a/test/scale/linear-test.js b/test/scale/linear-test.js
@@ -255,6 +255,8 @@ suite.addBatch({
         assert.deepEqual(x.domain(), [130, 0]);
         var x = d3.scale.linear().domain([0, 0.49]).nice();
         assert.deepEqual(x.domain(), [0, 0.5]);
+        var x = d3.scale.linear().domain([-0.1, 51.1]).nice(8);
+        assert.deepEqual(x.domain(), [-10, 60]);
       },
       "has no effect on degenerate domains": function(d3) {
         var x = d3.scale.linear().domain([0, 0]).nice();
@@ -266,7 +268,7 @@ suite.addBatch({
         var x = d3.scale.linear().domain([1.1, 1, 2, 3, 10.9]).nice();
         assert.deepEqual(x.domain(), [1, 1, 2, 3, 11]);
         var x = d3.scale.linear().domain([123.1, 1, 2, 3, -0.9]).nice();
-        assert.deepEqual(x.domain(), [130, 1, 2, 3, -10]);
+        assert.deepEqual(x.domain(), [140, 1, 2, 3, -20]);
       },
       "accepts a tick count to control nicing step": function(d3) {
         var x = d3.scale.linear().domain([12, 87]).nice(5);

diff --git a/test/scale/pow-test.js b/test/scale/pow-test.js
@@ -202,7 +202,7 @@ suite.addBatch({
         var x = d3.scale.pow().domain([1.1, 1, 2, 3, 10.9]).nice();
         assert.deepEqual(x.domain(), [1, 1, 2, 3, 11]);
         var x = d3.scale.pow().domain([123.1, 1, 2, 3, -0.9]).nice();
-        assert.deepEqual(x.domain(), [130, 1, 2, 3, -10]);
+        assert.deepEqual(x.domain(), [140, 1, 2, 3, -20]);
       },
       "accepts a tick count to control nicing step": function(d3) {
         var x = d3.scale.pow().domain([12, 87]).nice(5);

diff --git a/test/scale/sqrt-test.js b/test/scale/sqrt-test.js
@@ -199,7 +199,7 @@ suite.addBatch({
         var x = d3.scale.sqrt().domain([1.1, 1, 2, 3, 10.9]).nice(), f = d3.format(".6f");
         assert.deepEqual(x.domain().map(f), [1, 1, 2, 3, 11]);
         var x = d3.scale.sqrt().domain([123.1, 1, 2, 3, -0.9]).nice();
-        assert.deepEqual(x.domain().map(f), [130, 1, 2, 3, "-10.000000"]);
+        assert.deepEqual(x.domain().map(f), [140, 1, 2, 3, -20]);
       },
       "preserves specified domain exactly, with no floating point error": function(d3) {
         var x = d3.scale.sqrt().domain([0, 5]).nice();