Merge branch 'master' of https://github.com/jonseymour/d3 into 2.9.0

koolc · Mar 30, 2012 · 8062823 · 8062823
2 parents 4a01fb1 + f161415
commit 8062823
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/layout/histogram.js b/src/layout/histogram.js
@@ -28,8 +28,10 @@ d3.layout.histogram = function() {
       x = values[i];
       if ((x >= range[0]) && (x <= range[1])) {
         bin = bins[d3.bisect(thresholds, x, 1, m) - 1];
-        bin.y += k;
-        bin.push(data[i]);
+        if (bin) {
+          bin.y += k;
+          bin.push(data[i]);
+        }
       }
     }
 

diff --git a/test/layout/histogram-test.js b/test/layout/histogram-test.js
@@ -68,6 +68,10 @@ suite.addBatch({
         {x: 1, y: 1, dx: 1},
         {x: 2, y: 2, dx: 1}
       ]);
+    },
+    "can handle degenerate domain": function(histogram) {
+      var h = histogram().bins(d3.scale.linear().domain([0,0]).ticks(3));
+      assert.deepEqual(h([0]), []);
     }
   }
 });