Reduce scope of imports (#7000)

diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js
index 43c34a0087c87c4280dad262a323a34e10b69942..be85a2d1f5dd4f22a6d8c376506921ffbc6f4668 100644 (file)
--- a/src/controllers/controller.bar.js
+++ b/src/controllers/controller.bar.js
@@ -2,7 +2,7 @@
 
 import DatasetController from '../core/core.datasetController';
 import defaults from '../core/core.defaults';
-import elements from '../elements';
+import Rectangle from '../elements/element.rectangle';
 import helpers from '../helpers';
 
 const valueOrDefault = helpers.valueOrDefault;
@@ -184,7 +184,7 @@ function isFloatBar(custom) {
 
 export default DatasetController.extend({
 
-       dataElementType: elements.Rectangle,
+       dataElementType: Rectangle,
 
        /**
         * @private

diff --git a/src/controllers/controller.bubble.js b/src/controllers/controller.bubble.js
index 82c5c0f89416f4bdf9e9cac201e5d5b813e04d36..7c47c0970d49782f6d2f597fd62b4116604822fd 100644 (file)
--- a/src/controllers/controller.bubble.js
+++ b/src/controllers/controller.bubble.js
@@ -2,7 +2,7 @@
 
 import DatasetController from '../core/core.datasetController';
 import defaults from '../core/core.defaults';
-import elements from '../elements';
+import Point from '../elements/element.point';
 import helpers from '../helpers';
 
 const resolve = helpers.options.resolve;
@@ -38,7 +38,7 @@ export default DatasetController.extend({
        /**
         * @protected
         */
-       dataElementType: elements.Point,
+       dataElementType: Point,
 
        /**
         * @private

diff --git a/src/controllers/controller.doughnut.js b/src/controllers/controller.doughnut.js
index 61caba2303c944754386637bf5390087661bdee1..73b85910245c28e43c6a205d98314bd48ca7caf4 100644 (file)
--- a/src/controllers/controller.doughnut.js
+++ b/src/controllers/controller.doughnut.js
@@ -2,7 +2,7 @@
 
 import DatasetController from '../core/core.datasetController';
 import defaults from '../core/core.defaults';
-import elements from '../elements';
+import Arc from '../elements/element.arc';
 import helpers from '../helpers';
 
 const valueOrDefault = helpers.valueOrDefault;
@@ -100,7 +100,7 @@ defaults._set('doughnut', {
 
 export default DatasetController.extend({
 
-       dataElementType: elements.Arc,
+       dataElementType: Arc,
 
        linkScales: helpers.noop,
 

diff --git a/src/controllers/controller.line.js b/src/controllers/controller.line.js
index 32e069a77944629052748d2fdecdac7a9e536575..445294156f2e157ca037962000d0a5fb85a41d6f 100644 (file)
--- a/src/controllers/controller.line.js
+++ b/src/controllers/controller.line.js
@@ -2,7 +2,8 @@
 
 import DatasetController from '../core/core.datasetController';
 import defaults from '../core/core.defaults';
-import elements from '../elements';
+import Line from '../elements/element.line';
+import Point from '../elements/element.point';
 import helpers from '../helpers';
 
 const valueOrDefault = helpers.valueOrDefault;
@@ -28,9 +29,9 @@ defaults._set('line', {
 
 export default DatasetController.extend({
 
-       datasetElementType: elements.Line,
+       datasetElementType: Line,
 
-       dataElementType: elements.Point,
+       dataElementType: Point,
 
        /**
         * @private

diff --git a/src/controllers/controller.polarArea.js b/src/controllers/controller.polarArea.js
index 8eb1e6b0eccc35d2c8d530ad210d66a9ad037089..d337af133ac86cb0c9fc4e15cbaa25e2efba6df1 100644 (file)
--- a/src/controllers/controller.polarArea.js
+++ b/src/controllers/controller.polarArea.js
@@ -2,7 +2,7 @@
 
 import DatasetController from '../core/core.datasetController';
 import defaults from '../core/core.defaults';
-import elements from '../elements';
+import Arc from '../elements/element.arc';
 import helpers from '../helpers';
 
 const resolve = helpers.options.resolve;
@@ -93,7 +93,7 @@ function getStartAngleRadians(deg) {
 
 export default DatasetController.extend({
 
-       dataElementType: elements.Arc,
+       dataElementType: Arc,
 
        /**
         * @private

diff --git a/src/controllers/controller.radar.js b/src/controllers/controller.radar.js
index 05cbc7c1f31947c726d501ea974b21ca225826b5..6020821faef8e3d611e565771f31de0e59a295e6 100644 (file)
--- a/src/controllers/controller.radar.js
+++ b/src/controllers/controller.radar.js
@@ -2,7 +2,8 @@
 
 import DatasetController from '../core/core.datasetController';
 import defaults from '../core/core.defaults';
-import elements from '../elements';
+import Line from '../elements/element.line';
+import Point from '../elements/element.point';
 import helpers from '../helpers';
 
 const valueOrDefault = helpers.valueOrDefault;
@@ -22,9 +23,9 @@ defaults._set('radar', {
 });
 
 export default DatasetController.extend({
-       datasetElementType: elements.Line,
+       datasetElementType: Line,
 
-       dataElementType: elements.Point,
+       dataElementType: Point,
 
        /**
         * @private

diff --git a/src/core/core.plugins.js b/src/core/core.plugins.js
index 4f7a03d2faadbdd0d837ef19cac3597ca3ecb5d8..df5da2ec224586da0ea9d50d0b9d77312a4f8664 100644 (file)
--- a/src/core/core.plugins.js
+++ b/src/core/core.plugins.js
@@ -1,7 +1,7 @@
 'use strict';
 
 import defaults from './core.defaults';
-import helpers from '../helpers/';
+import {clone} from '../helpers/helpers.core';
 
 defaults._set('plugins', {});
 
@@ -142,7 +142,7 @@ export default {
                        }
 
                        if (opts === true) {
-                               opts = helpers.clone(defaults.plugins[id]);
+                               opts = clone(defaults.plugins[id]);
                        }
 
                        plugins.push(plugin);

diff --git a/src/core/core.scaleService.js b/src/core/core.scaleService.js
index f6fd60c30a01cc425e488a5f72d60e88d6d1f0f2..7b0ad4763097bf7633f6d98027c0ef22a3b91d64 100644 (file)
--- a/src/core/core.scaleService.js
+++ b/src/core/core.scaleService.js
@@ -1,7 +1,7 @@
 'use strict';
 
 import defaults from './core.defaults';
-import helpers from '../helpers';
+import {clone, each, extend, merge} from '../helpers/helpers.core';
 import layouts from './core.layouts';
 
 export default {
@@ -15,24 +15,24 @@ export default {
        defaults: {},
        registerScaleType: function(type, scaleConstructor, scaleDefaults) {
                this.constructors[type] = scaleConstructor;
-               this.defaults[type] = helpers.clone(scaleDefaults);
+               this.defaults[type] = clone(scaleDefaults);
        },
        getScaleConstructor: function(type) {
                return Object.prototype.hasOwnProperty.call(this.constructors, type) ? this.constructors[type] : undefined;
        },
        getScaleDefaults: function(type) {
                // Return the scale defaults merged with the global settings so that we always use the latest ones
-               return Object.prototype.hasOwnProperty.call(this.defaults, type) ? helpers.merge({}, [defaults.scale, this.defaults[type]]) : {};
+               return Object.prototype.hasOwnProperty.call(this.defaults, type) ? merge({}, [defaults.scale, this.defaults[type]]) : {};
        },
        updateScaleDefaults: function(type, additions) {
                var me = this;
                if (Object.prototype.hasOwnProperty.call(me.defaults, type)) {
-                       me.defaults[type] = helpers.extend(me.defaults[type], additions);
+                       me.defaults[type] = extend(me.defaults[type], additions);
                }
        },
        addScalesToLayout: function(chart) {
                // Adds each scale to the chart.boxes array to be sized accordingly
-               helpers.each(chart.scales, function(scale) {
+               each(chart.scales, function(scale) {
                        // Set ILayoutItem parameters for backwards compatibility
                        scale.fullWidth = scale.options.fullWidth;
                        scale.position = scale.options.position;