From 43505407b3d75ad416dc4feda3b741a07b294e0d Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Thu, 1 Oct 2015 13:29:47 -0400
Subject: [PATCH] chore(popup): Added md mode animation's for popup and added
 to config

Removed the background from the md scss file. References #183
---
 ionic/components/popup/modes/md.scss |  3 ---
 ionic/components/popup/popup.ts      | 26 ++++++++++++++++++++------
 ionic/config/modes.ts                |  5 +++++
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/ionic/components/popup/modes/md.scss b/ionic/components/popup/modes/md.scss
index c54d6d6bfc..6c2c9a65a7 100644
--- a/ionic/components/popup/modes/md.scss
+++ b/ionic/components/popup/modes/md.scss
@@ -3,7 +3,6 @@
 // --------------------------------------------------
 
 $popup-md-max-width:                      280px !default;
-$popup-md-background:                     rgba(0,0,0,0.5) !default;
 $popup-md-border-radius:                  2px !default;
 $popup-md-background-color:               #fafafa !default;
 $popup-md-box-shadow:                     0px 16px 20px rgba(0, 0, 0, 0.4) !default;
@@ -24,8 +23,6 @@ $popup-md-prompt-input-margin-bottom:     5px !default;
 
 
 ion-popup {
-  background: $popup-md-background;
-
   popup-wrapper {
     max-width: $popup-md-max-width;
     border-radius: $popup-md-border-radius;
diff --git a/ionic/components/popup/popup.ts b/ionic/components/popup/popup.ts
index b48bca4d5e..7ddd6afbbc 100644
--- a/ionic/components/popup/popup.ts
+++ b/ionic/components/popup/popup.ts
@@ -4,7 +4,6 @@ import {FORM_DIRECTIVES, NgControl, NgControlGroup,
 import {Overlay} from '../overlay/overlay';
 import {Animation} from '../../animations/animation';
 import {Ion} from '../ion';
-import {IonInput} from '../form/input';
 import * as util from 'ionic/util';
 
 
@@ -58,9 +57,10 @@ export class Popup extends Overlay {
      */
     popup(context, opts={}) {
     return new Promise((resolve, reject)=> {
+      let config = this.config;
       let defaults = {
-        enterAnimation: 'popup-pop-in',
-        leaveAnimation: 'popup-pop-out',
+        enterAnimation: config.setting('popupPopIn'),
+        leaveAnimation: config.setting('popupPopOut'),
       };
 
       context.promiseResolve = resolve;
@@ -204,7 +204,7 @@ const OVERLAY_TYPE = 'popup';
   '<backdrop (click)="_cancel($event)" tappable disable-activated></backdrop>' +
   '<popup-wrapper>' +
     '<div class="popup-head">' +
-      '<h2 class="popup-title" [inner-html]="title"></h2>' +
+      '<h2 class="popup-title" [inner-html]="title" *ng-if="title"></h2>' +
       '<h3 class="popup-sub-title" [inner-html]="subTitle" *ng-if="subTitle"></h3>' +
     '</div>' +
     '<div class="popup-body">' +
@@ -281,7 +281,6 @@ class PopupAnimation extends Animation {
 class PopupPopIn extends PopupAnimation {
   constructor(element) {
     super(element);
-
     this.wrapper.fromTo('opacity', '0', '1')
     this.wrapper.fromTo('scale', '1.1', '1');
 
@@ -290,7 +289,6 @@ class PopupPopIn extends PopupAnimation {
 }
 Animation.register('popup-pop-in', PopupPopIn);
 
-
 class PopupPopOut extends PopupAnimation {
   constructor(element) {
     super(element);
@@ -301,3 +299,19 @@ class PopupPopOut extends PopupAnimation {
   }
 }
 Animation.register('popup-pop-out', PopupPopOut);
+
+class PopupMdPopIn extends PopupPopIn {
+  constructor(element) {
+    super(element);
+    this.backdrop.fromTo('opacity', '0', '0.5')
+  }
+}
+Animation.register('popup-md-pop-in', PopupMdPopIn);
+
+class PopupMdPopOut extends PopupPopOut {
+  constructor(element) {
+    super(element);
+    this.backdrop.fromTo('opacity', '0.5', '0')
+  }
+}
+Animation.register('popup-md-pop-out', PopupMdPopOut);
diff --git a/ionic/config/modes.ts b/ionic/config/modes.ts
index 509c0a854f..ae4e3ac82e 100644
--- a/ionic/config/modes.ts
+++ b/ionic/config/modes.ts
@@ -21,6 +21,8 @@ IonicConfig.modeConfig('ios', {
   tabBarPlacement: 'bottom',
   viewTransition: 'ios',
 
+  popupPopIn: 'popup-pop-in',
+  popupPopOut: 'popup-pop-out',
 });
 
 
@@ -43,6 +45,9 @@ IonicConfig.modeConfig('md', {
   tabBarPlacement: 'top',
   viewTransition: 'md',
 
+  popupPopIn: 'popup-md-pop-in',
+  popupPopOut: 'popup-md-pop-out',  
+
   type: 'overlay',
   mdRipple: true,
 });