From e43d0e6057403174449100395fe10f53e5204422 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Tue, 10 Nov 2015 21:42:42 -0600 Subject: [PATCH] chore(popup): rename animation config Closes #244 --- ionic/components/popup/popup.ts | 4 ++-- ionic/config/modes.ts | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ionic/components/popup/popup.ts b/ionic/components/popup/popup.ts index f5d152ba7a..155bb46b46 100644 --- a/ionic/components/popup/popup.ts +++ b/ionic/components/popup/popup.ts @@ -67,8 +67,8 @@ export class Popup { constructor(ctrl: OverlayController, config: Config) { this.ctrl = ctrl; this._defaults = { - enterAnimation: config.get('popupPopIn'), - leaveAnimation: config.get('popupPopOut'), + enterAnimation: config.get('popupEnter'), + leaveAnimation: config.get('popupLeave'), }; } diff --git a/ionic/config/modes.ts b/ionic/config/modes.ts index 68b198c90d..b3257e3aac 100644 --- a/ionic/config/modes.ts +++ b/ionic/config/modes.ts @@ -24,8 +24,8 @@ Config.setModeConfig('ios', { pageTransition: 'ios', pageTransitionDelay: 16, - popupPopIn: 'popup-pop-in', - popupPopOut: 'popup-pop-out', + popupEnter: 'popup-pop-in', + popupLeave: 'popup-pop-out', tabbarPlacement: 'bottom', }); @@ -53,8 +53,8 @@ Config.setModeConfig('md', { pageTransition: 'md', pageTransitionDelay: 80, - popupPopIn: 'popup-md-pop-in', - popupPopOut: 'popup-md-pop-out', + popupEnter: 'popup-md-pop-in', + popupLeave: 'popup-md-pop-out', tabbarHighlight: true, tabbarPlacement: 'top',