From 3e9bbb6531c573474a5b809306e2e14fef290dda Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Thu, 3 Aug 2017 16:02:25 -0500
Subject: [PATCH] fix(animations): fix animation-controller

---
 .../animation-controller/animation-controller.tsx | 15 +++------------
 .../animation-controller/transition-end.ts        |  4 ++--
 packages/core/src/components/modal/modal.tsx      |  4 +++-
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/packages/core/src/components/animation-controller/animation-controller.tsx b/packages/core/src/components/animation-controller/animation-controller.tsx
index 2fb674356c..403e422e67 100644
--- a/packages/core/src/components/animation-controller/animation-controller.tsx
+++ b/packages/core/src/components/animation-controller/animation-controller.tsx
@@ -1,24 +1,15 @@
 import { Component } from '@stencil/core';
-import { Animation } from './animation-interface';
 import { Animator } from './animator';
-import { Ionic, IonicControllerApi } from '../../index';
+import { Ionic } from '../../index';
 
 
 @Component({
   tag: 'ion-animation-controller'
 })
-export class AnimationController implements IonicControllerApi {
+export class AnimationController {
 
   ionViewWillLoad() {
-    debugger;;;
-    Ionic.registerController('animation', this);
-  }
-
-  load(): Promise<Animation> {
-    return new Promise(resolve => {
-      debugger;
-      resolve((Animator as any));
-    });
+    Ionic.registerController('animation', Animator);
   }
 
 }
diff --git a/packages/core/src/components/animation-controller/transition-end.ts b/packages/core/src/components/animation-controller/transition-end.ts
index 0fb7f94398..1ee9ffdeec 100644
--- a/packages/core/src/components/animation-controller/transition-end.ts
+++ b/packages/core/src/components/animation-controller/transition-end.ts
@@ -7,7 +7,7 @@ export function transitionEnd(elm: HTMLElement, callback: {(ev?: TransitionEvent
 
   function unregister() {
     unRegWKTrans && unRegWKTrans();
-    unRegWKTrans && unRegTrans();
+    unRegTrans && unRegTrans();
   }
 
   function onTransitionEnd(ev: TransitionEvent) {
@@ -24,7 +24,7 @@ export function transitionEnd(elm: HTMLElement, callback: {(ev?: TransitionEvent
     };
 
     elm.addEventListener('transitionend', onTransitionEnd, opts);
-    unRegWKTrans = function() {
+    unRegTrans = function() {
       elm.removeEventListener('transitionend', onTransitionEnd, opts);
     };
   }
diff --git a/packages/core/src/components/modal/modal.tsx b/packages/core/src/components/modal/modal.tsx
index 2c3973b23b..35d02d477c 100644
--- a/packages/core/src/components/modal/modal.tsx
+++ b/packages/core/src/components/modal/modal.tsx
@@ -12,6 +12,9 @@ import iOSLeaveAnimation from './animations/ios.leave';
     ios: 'modal.ios.scss',
     md: 'modal.md.scss',
     wp: 'modal.wp.scss'
+  },
+  host: {
+    theme: 'modal'
   }
 })
 export class Modal {
@@ -36,7 +39,6 @@ export class Modal {
   @Prop() showBackdrop: boolean = true;
 
 
-
   private animation: Animation;
 
   @Listen('ionDismiss')