From ea95cc094779d0d91ff6a5b9b4ff3b751001a2e7 Mon Sep 17 00:00:00 2001 From: mhartington Date: Mon, 7 Aug 2017 11:55:39 -0400 Subject: [PATCH] fix(): update global references --- .../action-sheet-controller.tsx | 4 ++-- .../components/action-sheet/animations/ios.enter.ts | 10 +++++----- .../components/action-sheet/animations/ios.leave.ts | 10 +++++----- .../popover-controller/popover-controller.tsx | 4 ++-- .../src/components/popover/animations/ios.enter.ts | 9 +++++---- .../src/components/popover/animations/ios.leave.ts | 10 +++++----- 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/packages/core/src/components/action-sheet-controller/action-sheet-controller.tsx b/packages/core/src/components/action-sheet-controller/action-sheet-controller.tsx index e3244adf97..248679da5f 100644 --- a/packages/core/src/components/action-sheet-controller/action-sheet-controller.tsx +++ b/packages/core/src/components/action-sheet-controller/action-sheet-controller.tsx @@ -1,5 +1,5 @@ import { Component, Listen } from '@stencil/core'; -import { ActionSheetEvent, ActionSheetOptions, ActionSheet, IonicControllerApi } from '../../index'; +import { ActionSheetEvent, ActionSheetOptions, ActionSheet, IonicControllerApi, Ionic } from '../../index'; @Component({ @@ -15,7 +15,7 @@ export class ActionSheetController implements IonicControllerApi { ionViewDidLoad() { this.appRoot = document.querySelector('ion-app') || document.body; - Ionic.loadController('action-sheet', this); + Ionic.registerController('action-sheet', this); } diff --git a/packages/core/src/components/action-sheet/animations/ios.enter.ts b/packages/core/src/components/action-sheet/animations/ios.enter.ts index 5bfbacd55c..4beedd04d6 100644 --- a/packages/core/src/components/action-sheet/animations/ios.enter.ts +++ b/packages/core/src/components/action-sheet/animations/ios.enter.ts @@ -1,15 +1,15 @@ - +import { Animation } from '../../../index'; /** * iOS Loading Enter Animation */ -export default function(baseElm: HTMLElement) { - const baseAnimation = new Ionic.Animation(); +export default function(Animation: Animation, baseElm: HTMLElement) { + const baseAnimation = new Animation(); - const backdropAnimation = new Ionic.Animation(); + const backdropAnimation = new Animation(); backdropAnimation.addElement(baseElm.querySelector('.loading-backdrop')); - const wrapperAnimation = new Ionic.Animation(); + const wrapperAnimation = new Animation(); wrapperAnimation.addElement(baseElm.querySelector('.loading-wrapper')); backdropAnimation.fromTo('opacity', 0.01, 0.3); diff --git a/packages/core/src/components/action-sheet/animations/ios.leave.ts b/packages/core/src/components/action-sheet/animations/ios.leave.ts index f7b4c1b3e2..b9f1dd5b16 100644 --- a/packages/core/src/components/action-sheet/animations/ios.leave.ts +++ b/packages/core/src/components/action-sheet/animations/ios.leave.ts @@ -1,15 +1,15 @@ - +import { Animation } from '../../../index'; /** * iOS Loading Leave Animation */ -export default function(baseElm: HTMLElement) { - const baseAnimation = new Ionic.Animation(); +export default function(Animation: Animation, baseElm: HTMLElement) { + const baseAnimation = new Animation(); - const backdropAnimation = new Ionic.Animation(); + const backdropAnimation = new Animation(); backdropAnimation.addElement(baseElm.querySelector('.loading-backdrop')); - const wrapperAnimation = new Ionic.Animation(); + const wrapperAnimation = new Animation(); wrapperAnimation.addElement(baseElm.querySelector('.loading-wrapper')); backdropAnimation.fromTo('opacity', 0.3, 0); diff --git a/packages/core/src/components/popover-controller/popover-controller.tsx b/packages/core/src/components/popover-controller/popover-controller.tsx index 34579e57ee..2966f4be84 100644 --- a/packages/core/src/components/popover-controller/popover-controller.tsx +++ b/packages/core/src/components/popover-controller/popover-controller.tsx @@ -1,5 +1,5 @@ import { Component, Listen } from '@stencil/core'; -import { PopoverEvent, PopoverOptions, Popover, IonicControllerApi } from '../../index'; +import { PopoverEvent, PopoverOptions, Popover, IonicControllerApi, Ionic } from '../../index'; @Component({ @@ -15,7 +15,7 @@ export class PopoverController implements IonicControllerApi { ionViewDidLoad() { this.appRoot = document.querySelector('ion-app') || document.body; - Ionic.loadController('popover', this); + Ionic.registerController('popover', this); } diff --git a/packages/core/src/components/popover/animations/ios.enter.ts b/packages/core/src/components/popover/animations/ios.enter.ts index af964d5800..81d410085a 100644 --- a/packages/core/src/components/popover/animations/ios.enter.ts +++ b/packages/core/src/components/popover/animations/ios.enter.ts @@ -1,11 +1,12 @@ +import { Animation } from '../../../index'; -export default function(baseElm: HTMLElement) { - const baseAnimation = new Ionic.Animation(); +export default function(Animation: Animation, baseElm: HTMLElement) { + const baseAnimation = new Animation(); - const backdropAnimation = new Ionic.Animation(); + const backdropAnimation = new Animation(); backdropAnimation.addElement(baseElm.querySelector('.popover-backdrop')); - const wrapperAnimation = new Ionic.Animation(); + const wrapperAnimation = new Animation(); wrapperAnimation.addElement(baseElm.querySelector('.popover-wrapper')); backdropAnimation.fromTo('opacity', 0.01, 0.3); diff --git a/packages/core/src/components/popover/animations/ios.leave.ts b/packages/core/src/components/popover/animations/ios.leave.ts index 6c07e4749d..548f4555c6 100644 --- a/packages/core/src/components/popover/animations/ios.leave.ts +++ b/packages/core/src/components/popover/animations/ios.leave.ts @@ -1,15 +1,15 @@ - +import { Animation } from '../../../index'; /** * iOS Modal Leave Animation */ -export default function(baseElm: HTMLElement) { - const baseAnimation = new Ionic.Animation(); +export default function(Animation: Animation, baseElm: HTMLElement) { + const baseAnimation = new Animation(); - const backdropAnimation = new Ionic.Animation(); + const backdropAnimation = new Animation(); backdropAnimation.addElement(baseElm.querySelector('.modal-backdrop')); - const wrapperAnimation = new Ionic.Animation(); + const wrapperAnimation = new Animation(); const wrapperElm = baseElm.querySelector('.modal-wrapper'); wrapperAnimation.addElement(wrapperElm); const wrapperElmRect = wrapperElm.getBoundingClientRect();