Merge pull request #204 from racker/fix-area-again

fix(components.area) Another empty data check.
racker · Sep 19, 2013 · 85b8f96 · 85b8f96
2 parents f7ff3e4 + 3cf85da
commit 85b8f96
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/components/area.js b/src/components/area.js
@@ -154,7 +154,7 @@ function(array, config, obj, fn, string, d3util, mixins, dataFns) {
 
       dataConfig = area.data();
       // Return early if there's no data.
-      if (!dataConfig || !dataConfig.data) {
+      if (!dataConfig || !dataConfig.data || !dataConfig.data.length) {
         return area;
       }
 

diff --git a/test/unit/components/area.spec.js b/test/unit/components/area.spec.js
@@ -312,6 +312,23 @@ function(area, dc) {
         expect(exceptionThrown).toBe(false);
       });
 
+      it('dies gracefully if data is set but empty', function() {
+        var exceptionThrown = false;
+        dataCollection = dc.create();
+        dataCollection.add({
+          id: 'foo',
+          data: []
+        });
+        testArea = area();
+        testArea.data(dataCollection);
+        try {
+          testArea.render(selection);
+        } catch (e) {
+          exceptionThrown = true;
+        }
+        expect(exceptionThrown).toBe(false);
+      });
+
     });
 
     describe('root()', function() {