Rename platform/platform to index removing default (#7391)

Rename platform/platform to index removing default

diff --git a/src/core/core.controller.js b/src/core/core.controller.js
index cdc82748a49a1efba202b2e29b9de1b4523d160b..af83b327f137b887ce4ad41179f633f113cf0359 100644 (file)
--- a/src/core/core.controller.js
+++ b/src/core/core.controller.js
@@ -4,7 +4,7 @@ import defaults from './core.defaults';
 import helpers from '../helpers/index';
 import Interaction from './core.interaction';
 import layouts from './core.layouts';
-import {BasicPlatform, DomPlatform} from '../platform/platforms';
+import {BasicPlatform, DomPlatform} from '../platform';
 import plugins from './core.plugins';
 import scaleService from './core.scaleService';
 import {getMaximumWidth, getMaximumHeight} from '../helpers/helpers.dom';

diff --git a/src/index.js b/src/index.js
index 5be7ae14a11918ad8197da5128c0a25a7cd09ff1..6dcc113c6ed03d37c065e74834e3c3c1764b82d0 100644 (file)
--- a/src/index.js
+++ b/src/index.js
@@ -17,7 +17,7 @@ import Element from './core/core.element';
 import * as elements from './elements/index';
 import Interaction from './core/core.interaction';
 import layouts from './core/core.layouts';
-import platforms from './platform/platforms';
+import * as platforms from './platform';
 import pluginsCore from './core/core.plugins';
 import Scale from './core/core.scale';
 import scaleService from './core/core.scaleService';

diff --git a/src/platform/index.js b/src/platform/index.js
new file mode 100644 (file)
index 0000000..4d41363
--- /dev/null
+++ b/src/platform/index.js
@@ -0,0 +1,3 @@
+export {default as BasePlatform} from './platform.base';
+export {default as BasicPlatform} from './platform.basic';
+export {default as DomPlatform} from './platform.dom';

diff --git a/src/platform/platforms.js b/src/platform/platforms.js
deleted file mode 100644 (file)
index 8977ed4..0000000
--- a/src/platform/platforms.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import BasePlatform from './platform.base';
-import BasicPlatform from './platform.basic';
-import DomPlatform from './platform.dom';
-
-export {BasicPlatform, DomPlatform, BasePlatform};
-
-/**
- * @namespace Chart.platforms
- * @see https://chartjs.gitbooks.io/proposals/content/Platform.html
-*/
-export default {BasicPlatform, DomPlatform, BasePlatform};

diff --git a/test/specs/global.namespace.tests.js b/test/specs/global.namespace.tests.js
index 36f113a5fa6f29842ef9b99f8b2877180215c9d9..cb4675fc6d209ba733593c728da257b220a91b51 100644 (file)
--- a/test/specs/global.namespace.tests.js
+++ b/test/specs/global.namespace.tests.js
@@ -12,7 +12,11 @@ describe('Chart namespace', function() {
                        expect(Chart.Interaction instanceof Object).toBeTruthy();
                        expect(Chart.layouts instanceof Object).toBeTruthy();
                        expect(Chart.plugins instanceof Object).toBeTruthy();
-                       expect(Chart.platforms instanceof Object).toBeTruthy();
+
+                       expect(Chart.platforms.BasePlatform instanceof Function).toBeTruthy();
+                       expect(Chart.platforms.BasicPlatform instanceof Function).toBeTruthy();
+                       expect(Chart.platforms.DomPlatform instanceof Function).toBeTruthy();
+
                        expect(Chart.Scale instanceof Object).toBeTruthy();
                        expect(Chart.scaleService instanceof Object).toBeTruthy();
                        expect(Chart.Ticks instanceof Object).toBeTruthy();

diff --git a/test/specs/platform.dom.tests.js b/test/specs/platform.dom.tests.js
index 263b031682b9ac807761842027399f103b011993..9b97fa2be85c386055d7ecc9e35086dc543a9124 100644 (file)
--- a/test/specs/platform.dom.tests.js
+++ b/test/specs/platform.dom.tests.js
@@ -1,4 +1,4 @@
-import {DomPlatform} from '../../src/platform/platforms';
+import {DomPlatform} from '../../src/platform';
 
 describe('Platform.dom', function() {