Fix hasType when empty data - #757

c3.js

@@ -3263,10 +3263,12 @@
                     has = true;
                 }
             });
-        } else {
+        } else if (Object.keys(types).length) {
             Object.keys(types).forEach(function (id) {
                 if (types[id] === type) { has = true; }
             });
+        } else {
+            has = $$.config.data_type === type;
         }
         return has;
     };

spec/type-spec.js

@@ -20,39 +20,71 @@ describe('c3 chart types', function () {
     };
 
     beforeEach(function (done) {
-        if (typeof chart === 'undefined') {
+        chart = window.initChart(chart, args, done);
-            window.initDom();
-        }
-        chart = window.c3.generate(args);
         d3 = chart.internal.d3;
-        chart.internal.d3.select('.jasmine_html-reporter').style('display', 'none');
-
-        window.setTimeout(function () {
-            done();
-        }, 10);
     });
 
     describe('internal.hasArcType', function () {
 
-        it('should return true', function () {
+        describe('with data', function () {
-            expect(chart.internal.hasArcType()).toBeTruthy();
+
-        });
+            it('should return true', function () {
+                expect(chart.internal.hasArcType()).toBeTruthy();
+            });
+
+            it('should change chart type to "bar"', function () {
+                args.data.type = 'bar';
+                expect(true).toBeTruthy();
+            });
+
+            it('should return false', function () {
+                expect(chart.internal.hasArcType()).toBeFalsy();
+            });
 
-        it('should change chart type to "bar" successfully', function () {
-            args.data.type = 'bar';
-            expect(true).toBeTruthy();
         });
 
-        it('should return false', function () {
+        describe('with empty data', function () {
-            expect(chart.internal.hasArcType()).toBeFalsy();
+
+            it('should update args to have empty data', function () {
+                args = {
+                    data: {
+                        columns: [],
+                        type: 'pie'
+                    }
+                };
+                expect(true).toBeTruthy();
+            });
+
+            it('should return true', function () {
+                expect(chart.internal.hasArcType()).toBeTruthy();
+            });
+
+            it('should change chart type to "bar"', function () {
+                args.data.type = 'bar';
+                expect(true).toBeTruthy();
+            });
+
+            it('should return false', function () {
+                expect(chart.internal.hasArcType()).toBeFalsy();
+            });
+
         });
 
     });
 
     describe('internal.hasType', function () {
 
-        it('should change chart type to "pie" successfully', function () {
+        it('should update args', function () {
-            args.data.type = 'pie';
+            args = {
+                data: {
+                    columns: [
+                        ['data1', 30, 200, 100, 400, 150, 250],
+                        ['data2', 50, 20, 10, 40, 15, 25],
+                        ['data3', 150, 120, 110, 140, 115, 125]
+                    ],
+                    type: 'pie'
+                }
+            };
             expect(true).toBeTruthy();
         });
 

src/type.js

@@ -18,10 +18,12 @@ c3_chart_internal_fn.hasType = function (type, targets) {
                 has = true;
             }
         });
-    } else {
+    } else if (Object.keys(types).length) {
         Object.keys(types).forEach(function (id) {
             if (types[id] === type) { has = true; }
         });
+    } else {
+        has = $$.config.data_type === type;
     }
     return has;
 };