octicon-mirror(24/)
javascript/ionic-framework
octicon-rss(16/)
1
0
octicon-repo-forked(16/)Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-10 00:27:41 +08:00
octicon-code(16/) Code octicon-issue-opened(16/) Issues octicon-package(16/) Packages octicon-project(16/) Projects octicon-tag(16/) Releases octicon-book(16/) Wiki octicon-pulse(16/) Activity

fix(loading): fix enter animation

Browse Source
This commit is contained in:
octicon-git-branch(16/)
octicon-tag(16/)
Adam Bradley
2017-08-03 20:43:05 -05:00
gitea-unlock(16/)
parent f1b60c61c3
commit 5bdc184695
octicon-diff(16/tw-mr-1) 3 changed files with 3 additions and 5 deletions
gitea-whitespace(16/)
gitea-split(16/)
octicon-kebab-horizontal(16/)
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "@ionic/core",
"version": "0.0.2-1",
"version": "0.0.2-2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
packages/core/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@ionic/core",
"version": "0.0.2-1",
"version": "0.0.2-2",
"description": "Base components for Ionic",
"main": "dist/collection/index.js",
"types": "dist/collection/index.d.ts",

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

@@ -93,13 +93,12 @@ export class Loading {
if (!animationBuilder) {
// user did not provide a custom animation fn
// decide from the config which animation to use
// TODO!!
animationBuilder = iOSEnterAnimation;
}
// build the animation and kick it off
Ionic.controller('animation').then(Animation => {
this.animation = new Animation();
this.animation = animationBuilder(Animation, this.el);
this.animation.onFinish((a: any) => {
a.destroy();
@@ -129,7 +128,6 @@ export class Loading {
if (!animationBuilder) {
// user did not provide a custom animation fn
// decide from the config which animation to use
// TODO!!
animationBuilder = iOSLeaveAnimation;
}