From 553ae385a8382609ca30d53a91aa3ea4b0db6745 Mon Sep 17 00:00:00 2001 From: Jukka Kurkela Date: Fri, 29 May 2020 00:37:19 +0300 Subject: [PATCH] Consistency: Use lower case for instances (#7436) Consistency: Use lover case for instances --- src/core/core.animations.js | 4 ++-- src/core/core.animator.js | 1 + src/core/core.controller.js | 16 ++++++++-------- src/core/index.js | 8 ++++---- src/index.js | 4 ++-- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/core/core.animations.js b/src/core/core.animations.js index 380f431fb..343a67ecc 100644 --- a/src/core/core.animations.js +++ b/src/core/core.animations.js @@ -1,4 +1,4 @@ -import Animator from './core.animator'; +import animator from './core.animator'; import Animation from './core.animation'; import defaults from './core.defaults'; import {noop, isObject} from '../helpers/helpers.core'; @@ -206,7 +206,7 @@ export default class Animations { const animations = this._createAnimations(target, values); if (animations.length) { - Animator.add(this._chart, animations); + animator.add(this._chart, animations); return true; } } diff --git a/src/core/core.animator.js b/src/core/core.animator.js index 0c42c631c..18afeaaa3 100644 --- a/src/core/core.animator.js +++ b/src/core/core.animator.js @@ -20,6 +20,7 @@ function drawFPS(chart, count, date, lastDate) { /** * Please use the module's default export which provides a singleton instance + * Note: class is export for typedoc */ export class Animator { constructor() { diff --git a/src/core/core.controller.js b/src/core/core.controller.js index 856789582..052a15c58 100644 --- a/src/core/core.controller.js +++ b/src/core/core.controller.js @@ -1,5 +1,5 @@ /* eslint-disable import/no-namespace, import/namespace */ -import {default as Animator} from './core.animator'; +import animator from './core.animator'; import * as controllers from '../controllers'; import defaults from './core.defaults'; import Interaction from './core.interaction'; @@ -254,8 +254,8 @@ class Chart { return; } - Animator.listen(me, 'complete', onAnimationsComplete); - Animator.listen(me, 'progress', onAnimationProgress); + animator.listen(me, 'complete', onAnimationsComplete); + animator.listen(me, 'progress', onAnimationProgress); me._initialize(); if (me.attached) { @@ -305,7 +305,7 @@ class Chart { } stop() { - Animator.stop(this); + animator.stop(this); return this; } @@ -665,9 +665,9 @@ class Chart { callCallback(animationOptions && animationOptions.onComplete, [], me); }; - if (Animator.has(me)) { - if (me.attached && !Animator.running(me)) { - Animator.start(me); + if (animator.has(me)) { + if (me.attached && !animator.running(me)) { + animator.start(me); } } else { me.draw(); @@ -910,7 +910,7 @@ class Chart { let i, ilen; me.stop(); - Animator.remove(me); + animator.remove(me); // dataset controllers need to cleanup associated data for (i = 0, ilen = me.data.datasets.length; i < ilen; ++i) { diff --git a/src/core/index.js b/src/core/index.js index 7ccb6c9b8..6f91d53e8 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -1,14 +1,14 @@ export {default as _adapters} from './core.adapters'; export {default as Animation} from './core.animation'; export {default as Animations} from './core.animations'; -export {default as Animator} from './core.animator'; +export {default as animator} from './core.animator'; export {default as Chart} from './core.controller'; export {default as DatasetController} from './core.datasetController'; -export {default as Defaults} from './core.defaults'; +export {default as defaults} from './core.defaults'; export {default as Element} from './core.element'; export {default as Interaction} from './core.interaction'; -export {default as Layouts} from './core.layouts'; -export {default as Plugins} from './core.plugins'; +export {default as layouts} from './core.layouts'; +export {default as plugins} from './core.plugins'; export {default as Scale} from './core.scale'; export {default as ScaleService} from './core.scaleService'; export {default as Ticks} from './core.ticks'; diff --git a/src/index.js b/src/index.js index 015d00017..4ee572ae7 100644 --- a/src/index.js +++ b/src/index.js @@ -8,7 +8,7 @@ import Chart from './core/core.controller'; import helpers from './helpers/index'; import _adapters from './core/core.adapters'; import Animation from './core/core.animation'; -import {default as Animator} from './core/core.animator'; +import animator from './core/core.animator'; import animationService from './core/core.animations'; import * as controllers from './controllers'; import DatasetController from './core/core.datasetController'; @@ -26,7 +26,7 @@ import Ticks from './core/core.ticks'; Chart.helpers = helpers; Chart._adapters = _adapters; Chart.Animation = Animation; -Chart.Animator = Animator; +Chart.animator = animator; Chart.animationService = animationService; Chart.controllers = controllers; Chart.DatasetController = DatasetController; -- 2.47.2