javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-08 23:58:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(animations): fix animation-controller

Browse Source
This commit is contained in:
Adam Bradley
2017-08-03 16:02:25 -05:00
parent b96f6fe650
commit 3e9bbb6531
3 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/core/src/components/animation-controller/animation-controller.tsx
View File

@ -1,24 +1,15 @@
import { Component } from '@stencil/core'; import { Component } from '@stencil/core';
import { Animation } from './animation-interface';
import { Animator } from './animator'; import { Animator } from './animator';
import { Ionic, IonicControllerApi } from '../../index'; import { Ionic } from '../../index';
@Component({ @Component({
tag: 'ion-animation-controller' tag: 'ion-animation-controller'
}) })
export class AnimationController implements IonicControllerApi { export class AnimationController {
ionViewWillLoad() { ionViewWillLoad() {
debugger;;; Ionic.registerController('animation', Animator);
Ionic.registerController('animation', this);
}
load(): Promise<Animation> {
return new Promise(resolve => {
debugger;
resolve((Animator as any));
});
} }
} }

4
packages/core/src/components/animation-controller/transition-end.ts
View File

@ -7,7 +7,7 @@ export function transitionEnd(elm: HTMLElement, callback: {(ev?: TransitionEvent
function unregister() { function unregister() {
unRegWKTrans && unRegWKTrans(); unRegWKTrans && unRegWKTrans();
unRegWKTrans && unRegTrans(); unRegTrans && unRegTrans();
} }
function onTransitionEnd(ev: TransitionEvent) { function onTransitionEnd(ev: TransitionEvent) {
@ -24,7 +24,7 @@ export function transitionEnd(elm: HTMLElement, callback: {(ev?: TransitionEvent
}; };
elm.addEventListener('transitionend', onTransitionEnd, opts); elm.addEventListener('transitionend', onTransitionEnd, opts);
unRegWKTrans = function() { unRegTrans = function() {
elm.removeEventListener('transitionend', onTransitionEnd, opts); elm.removeEventListener('transitionend', onTransitionEnd, opts);
}; };
} }

4
packages/core/src/components/modal/modal.tsx
View File

@ -12,6 +12,9 @@ import iOSLeaveAnimation from './animations/ios.leave';
ios: 'modal.ios.scss', ios: 'modal.ios.scss',
md: 'modal.md.scss', md: 'modal.md.scss',
wp: 'modal.wp.scss' wp: 'modal.wp.scss'
},
host: {
theme: 'modal'
} }
}) })
export class Modal { export class Modal {
@ -36,7 +39,6 @@ export class Modal {
@Prop() showBackdrop: boolean = true; @Prop() showBackdrop: boolean = true;
private animation: Animation; private animation: Animation;
@Listen('ionDismiss') @Listen('ionDismiss')