JavaScriptCollection
diff --git a/‎d3.js‎
Lines changed: 1 addition & 2 deletions b/‎d3.js‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎d3.min.js‎
Lines changed: 5 additions & 5 deletions b/‎d3.min.js‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎src/scale/quantile.js‎
Lines changed: 1 addition & 2 deletions b/‎src/scale/quantile.js‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎test/scale/quantile-test.js‎
Lines changed: 4 additions & 0 deletions b/‎test/scale/quantile-test.js‎
Lines changed: 4 additions & 0 deletions
@@ -7022,8 +7022,7 @@ d3 = function() {
       return scale;
     }
     function scale(x) {
-      if (isNaN(x = +x)) return NaN;
-      return range[d3.bisect(thresholds, x)];
+      if (!isNaN(x = +x)) return range[d3.bisect(thresholds, x)];
     }
     scale.domain = function(x) {
       if (!arguments.length) return domain;
 
@@ -19,8 +19,7 @@ function d3_scale_quantile(domain, range) {
   }
 
   function scale(x) {
-    if (isNaN(x = +x)) return NaN;
-    return range[d3.bisect(thresholds, x)];
+    if (!isNaN(x = +x)) return range[d3.bisect(thresholds, x)];
   }
 
   scale.domain = function(x) {
 
@@ -53,6 +53,10 @@ suite.addBatch({
       assert.deepEqual([8, 8.9].map(x), [b, b]);
       assert.deepEqual([9, 9.1, 10, 13].map(x), [c, c, c, c]);
       assert.deepEqual([14.9, 15, 15.1, 16, 20].map(x), [a, a, a, a, a]);
+    },
+    "returns undefined if the input value is NaN": function(quantile) {
+      var x = quantile().domain([3, 6, 7, 8, 8, 10, 13, 15, 16, 20]).range([0, 1, 2, 3]);
+      assert.isUndefined(x(NaN));
     }
   }
 });
Original file line number	Diff line number	Diff line change
`@@ -7022,8 +7022,7 @@ d3 = function() {`
`7022`	`7022`	`return scale;`
`7023`	`7023`	`}`
`7024`	`7024`	`function scale(x) {`
`7025`		`- if (isNaN(x = +x)) return NaN;`
`7026`		`- return range[d3.bisect(thresholds, x)];`
	`7025`	`+ if (!isNaN(x = +x)) return range[d3.bisect(thresholds, x)];`
`7027`	`7026`	`}`
`7028`	`7027`	`scale.domain = function(x) {`
`7029`	`7028`	`if (!arguments.length) return domain;`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,7 @@ function d3_scale_quantile(domain, range) {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`function scale(x) {`
`22`		`- if (isNaN(x = +x)) return NaN;`
`23`		`- return range[d3.bisect(thresholds, x)];`
	`22`	`+ if (!isNaN(x = +x)) return range[d3.bisect(thresholds, x)];`
`24`	`23`	`}`
`25`	`24`
`26`	`25`	`scale.domain = function(x) {`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,10 @@ suite.addBatch({`
`53`	`53`	`assert.deepEqual([8, 8.9].map(x), [b, b]);`
`54`	`54`	`assert.deepEqual([9, 9.1, 10, 13].map(x), [c, c, c, c]);`
`55`	`55`	`assert.deepEqual([14.9, 15, 15.1, 16, 20].map(x), [a, a, a, a, a]);`
	`56`	`+ },`
	`57`	`+ "returns undefined if the input value is NaN": function(quantile) {`
	`58`	`+ var x = quantile().domain([3, 6, 7, 8, 8, 10, 13, 15, 16, 20]).range([0, 1, 2, 3]);`
	`59`	`+ assert.isUndefined(x(NaN));`
`56`	`60`	`}`
`57`	`61`	`}`
`58`	`62`	`});`