Make the main controller importable (chartjs#5969)

Merge `core/core.js` in `core/core.controller.js`, split default options next to their associated code and deprecate `Chart.types` (not sure what it was for).
exwm · Jan 9, 2019 · 4c73f52 · 4c73f52
1 parent 8f226c0
commit 4c73f52
Show file tree

Hide file tree

Showing 6 changed files with 831 additions and 833 deletions.
diff --git a/src/chart.js b/src/chart.js
@@ -1,7 +1,7 @@
 /**
  * @namespace Chart
  */
-var Chart = require('./core/core')();
+var Chart = require('./core/core.controller');
 
 Chart.helpers = require('./helpers/index');
 
@@ -24,8 +24,6 @@ Chart.scaleService = require('./core/core.scaleService');
 Chart.Ticks = require('./core/core.ticks');
 Chart.Tooltip = require('./core/core.tooltip');
 
-require('./core/core.controller')(Chart);
-
 // Register built-in scales
 var scales = require('./scales');
 Chart.helpers.each(scales, function(scale, type) {