From 5bdc184695b21a97dd111c5120206059c21de55e Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Thu, 3 Aug 2017 20:43:05 -0500 Subject: [PATCH] fix(loading): fix enter animation --- packages/core/package-lock.json | 2 +- packages/core/package.json | 2 +- packages/core/src/components/loading/loading.tsx | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/core/package-lock.json b/packages/core/package-lock.json index 17f992b86a..cfcbf5aa7d 100644 --- a/packages/core/package-lock.json +++ b/packages/core/package-lock.json @@ -1,6 +1,6 @@ { "name": "@ionic/core", - "version": "0.0.2-1", + "version": "0.0.2-2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/core/package.json b/packages/core/package.json index bfb99ce353..20cb13544c 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -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", diff --git a/packages/core/src/components/loading/loading.tsx b/packages/core/src/components/loading/loading.tsx index b3a5cfc8b9..3088a5ea69 100644 --- a/packages/core/src/components/loading/loading.tsx +++ b/packages/core/src/components/loading/loading.tsx @@ -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; }