Turn elements/index into an index (#7135)

diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js
index 69aa5dbe52832970115cb908bc0e8db650d25533..eea8cd97c15426792a3161c806067f84fffdf2de 100644 (file)
--- a/src/controllers/controller.bar.js
+++ b/src/controllers/controller.bar.js
@@ -1,6 +1,6 @@
 import DatasetController from '../core/core.datasetController';
 import defaults from '../core/core.defaults';
-import Rectangle from '../elements/element.rectangle';
+import {Rectangle} from '../elements/index';
 import {clipArea, unclipArea} from '../helpers/helpers.canvas';
 import {isArray, isNullOrUndef, valueOrDefault} from '../helpers/helpers.core';
 import {_limitValue, sign} from '../helpers/helpers.math';

diff --git a/src/controllers/controller.bubble.js b/src/controllers/controller.bubble.js
index d4ee27b8421e2ea13e0ae9e74dab996c59252db2..2cad42c2463a41e6b1e7fad675b439344412abe6 100644 (file)
--- a/src/controllers/controller.bubble.js
+++ b/src/controllers/controller.bubble.js
@@ -1,6 +1,6 @@
 import DatasetController from '../core/core.datasetController';
 import defaults from '../core/core.defaults';
-import Point from '../elements/element.point';
+import {Point} from '../elements/index';
 import {resolve} from '../helpers/helpers.options';
 
 defaults.set('bubble', {

diff --git a/src/controllers/controller.doughnut.js b/src/controllers/controller.doughnut.js
index 8a59990bbeec249ff84559220add9e822601f1ea..362125447c480c7a4419d789aa97d3ba7002d21b 100644 (file)
--- a/src/controllers/controller.doughnut.js
+++ b/src/controllers/controller.doughnut.js
@@ -1,6 +1,6 @@
 import DatasetController from '../core/core.datasetController';
 import defaults from '../core/core.defaults';
-import Arc from '../elements/element.arc';
+import {Arc} from '../elements/index';
 import {isArray, valueOrDefault} from '../helpers/helpers.core';
 
 /**

diff --git a/src/controllers/controller.line.js b/src/controllers/controller.line.js
index bb567060b32f8f056995ad0467785d8d728f78ec..5af4eb67ca9291f1d31fbc5576433f344ce72cbd 100644 (file)
--- a/src/controllers/controller.line.js
+++ b/src/controllers/controller.line.js
@@ -1,7 +1,6 @@
 import DatasetController from '../core/core.datasetController';
 import defaults from '../core/core.defaults';
-import Line from '../elements/element.line';
-import Point from '../elements/element.point';
+import {Line, Point} from '../elements/index';
 import {valueOrDefault} from '../helpers/helpers.core';
 import {isNumber} from '../helpers/helpers.math';
 import {resolve} from '../helpers/helpers.options';

diff --git a/src/controllers/controller.polarArea.js b/src/controllers/controller.polarArea.js
index 125b4b011753daff30fe0197d7e98850fc53313f..28a92fbedd7c1e4fdbbdc7449cd7d4ddd0cbe48a 100644 (file)
--- a/src/controllers/controller.polarArea.js
+++ b/src/controllers/controller.polarArea.js
@@ -1,6 +1,6 @@
 import DatasetController from '../core/core.datasetController';
 import defaults from '../core/core.defaults';
-import Arc from '../elements/element.arc';
+import {Arc} from '../elements/index';
 import {toRadians} from '../helpers/helpers.math';
 import {resolve} from '../helpers/helpers.options';
 

diff --git a/src/controllers/controller.radar.js b/src/controllers/controller.radar.js
index 3b08c9143c87a34a7f63a6379e79a2cc7e4e81cd..dd6bd49951021e6bc4e1e5f43caf6a1b147ef6b8 100644 (file)
--- a/src/controllers/controller.radar.js
+++ b/src/controllers/controller.radar.js
@@ -1,7 +1,6 @@
 import DatasetController from '../core/core.datasetController';
 import defaults from '../core/core.defaults';
-import Line from '../elements/element.line';
-import Point from '../elements/element.point';
+import {Line, Point} from '../elements/index';
 import {valueOrDefault} from '../helpers/helpers.core';
 
 defaults.set('radar', {

diff --git a/src/elements/index.js b/src/elements/index.js
index dfb185c2ae95aa05f634ea3040702369b081451f..df91b3edf44b85a00a6b6dfd2471675961261fd3 100644 (file)
--- a/src/elements/index.js
+++ b/src/elements/index.js
@@ -1,11 +1,4 @@
-import Arc from './element.arc';
-import Line from './element.line';
-import Point from './element.point';
-import Rectangle from './element.rectangle';
-
-export default {
-       Arc,
-       Line,
-       Point,
-       Rectangle
-};
+export {default as Arc} from './element.arc';
+export {default as Line} from './element.line';
+export {default as Point} from './element.point';
+export {default as Rectangle} from './element.rectangle';

diff --git a/src/index.js b/src/index.js
index d1b19287a79f356204d182005ada10d49780454e..46b05d3f116b1f846e06f27250d152f775c0887a 100644 (file)
--- a/src/index.js
+++ b/src/index.js
@@ -1,3 +1,5 @@
+/* eslint-disable import/no-namespace, import/namespace */
+
 /**
  * @namespace Chart
  */
@@ -12,7 +14,7 @@ import controllers from './controllers/index';
 import DatasetController from './core/core.datasetController';
 import defaults from './core/core.defaults';
 import Element from './core/core.element';
-import elements from './elements/index';
+import * as elements from './elements/index';
 import Interaction from './core/core.interaction';
 import layouts from './core/core.layouts';
 import platforms from './platform/platforms';

diff --git a/test/specs/global.namespace.tests.js b/test/specs/global.namespace.tests.js
index 975670c3a41334c1ab90dc65c73e80f473d83d74..36f113a5fa6f29842ef9b99f8b2877180215c9d9 100644 (file)
--- a/test/specs/global.namespace.tests.js
+++ b/test/specs/global.namespace.tests.js
@@ -20,9 +20,6 @@ describe('Chart namespace', function() {
        });
 
        describe('Chart.elements', function() {
-               it('should be an object', function() {
-                       expect(Chart.elements instanceof Object).toBeTruthy();
-               });
                it('should contains "elements" classes', function() {
                        expect(Chart.elements.Arc instanceof Function).toBeTruthy();
                        expect(Chart.elements.Line instanceof Function).toBeTruthy();