Adds a better error message when the chart type is incorrect. Previously the user...

This gives something that's easier to understand and debug.

diff --git a/src/core/core.controller.js b/src/core/core.controller.js
index 1090aa9b80d71ad4f127663c0bb0bdaa1b230f7a..71eb3bb628c17beb68a88a6bbb1646a277f6c7c5 100644 (file)
--- a/src/core/core.controller.js
+++ b/src/core/core.controller.js
@@ -293,7 +293,12 @@ module.exports = function(Chart) {
                                if (meta.controller) {
                                        meta.controller.updateIndex(datasetIndex);
                                } else {
-                                       meta.controller = new Chart.controllers[meta.type](me, datasetIndex);
+                                       var ControllerClass = Chart.controllers[meta.type];
+                                       if (ControllerClass === undefined) {
+                                               throw new Error('"' + meta.type + '" is not a chart type.');
+                                       }
+
+                                       meta.controller = new ControllerClass(me, datasetIndex);
                                        newControllers.push(meta.controller);
                                }
                        }, me);

diff --git a/test/specs/core.controller.tests.js b/test/specs/core.controller.tests.js
index 18caee8bdb2799fcbc6e0cac2889449a8d8e92d6..1849da8c36381e1c741ca033e12bd5a77de6215f 100644 (file)
--- a/test/specs/core.controller.tests.js
+++ b/test/specs/core.controller.tests.js
@@ -144,6 +144,32 @@ describe('Chart', function() {
                        expect(scaleOptions.xAxes[0].position).toBe('bottom');
                        expect(scaleOptions.yAxes[0].position).toBe('left');
                });
+
+               it('should throw an error if the chart type is incorrect', function() {
+                       function createChart() {
+                               acquireChart({
+                                       type: 'area',
+                                       data: {
+                                               datasets: [{
+                                                       label: 'first',
+                                                       data: [10, 20]
+                                               }],
+                                               labels: ['0', '1'],
+                                       },
+                                       options: {
+                                               scales: {
+                                                       xAxes: [{
+                                                               position: 'left',
+                                                       }],
+                                                       yAxes: [{
+                                                               position: 'bottom'
+                                                       }]
+                                               }
+                                       }
+                               });
+                       }
+                       expect(createChart).toThrow(new Error('"area" is not a chart type.'));
+               });
        });
 
        describe('config.options.responsive: false', function() {