From 400bd719ebf442ccdb5661a432fc3588e19d3ea4 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Wed, 10 Jun 2015 17:44:47 -0500
Subject: [PATCH] Fade in modal

---
 ionic/components/app/test/snapcat/index.js |  2 +-
 ionic/components/modal/modal.js            | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ionic/components/app/test/snapcat/index.js b/ionic/components/app/test/snapcat/index.js
index 4371ec9136..89ecf685db 100644
--- a/ionic/components/app/test/snapcat/index.js
+++ b/ionic/components/app/test/snapcat/index.js
@@ -137,7 +137,7 @@ export class IonicApp {
   selector: 'settings-modal'
 })
 @View({
-  template: '<ion-view><ion-content padding><button primary (click)="close()">Close</button></ion-content></ion-view>',
+  template: '<ion-view><ion-content padding><button icon (click)="close()"><i class="icon ion-close"></i></button></ion-content></ion-view>',
   directives: [Nav, Button, Content]
 })
 export class SettingsModal {
diff --git a/ionic/components/modal/modal.js b/ionic/components/modal/modal.js
index ce6175302b..d0008fc768 100644
--- a/ionic/components/modal/modal.js
+++ b/ionic/components/modal/modal.js
@@ -69,6 +69,8 @@ export class Modal {
 
       modalRef.containerRef = containerRef;
 
+      modalRef.setOptions(this.opts);
+
       // Now load the user's modal component into the Modal
       return this.componentLoader.loadNextToExistingLocation(
           this.modalType, containerRef.instance.contentRef, contentInjector).then(contentRef => {
@@ -82,11 +84,11 @@ export class Modal {
   }
 
   show() {
-    return this._modalRef.open(this.opts.openAnimation);
+    return this._modalRef.open();
   }
 
   close() {
-    return this._modalRef.close(this.opts.closeAnimation);
+    return this._modalRef.close();
   }
 
 
@@ -118,6 +120,7 @@ class ModalContainer {
   }
 
   close(animation) {
+    console.log('Closing w/ anim', animation);
     var slideOut = Animation.create(this.domElement, animation);
     return slideOut.play();
   }
@@ -139,15 +142,19 @@ export class ModalRef {
     this.isClosed = false;
   }
 
-  open(animation) {
-    this.containerRef.instance.open(animation).then(() => {
+  setOptions(opts) {
+    this.opts = opts;
+  }
+
+  open() {
+    this.containerRef.instance.open(this.opts.openAnimation).then(() => {
       this.isClosed = false;
     })
   }
 
-  close(animation) {
+  close() {
     // Close, then dispose y'all
-    this.containerRef.instance.close(animation).then(() => {
+    this.containerRef.instance.close(this.opts.closeAnimation).then(() => {
       this.isClosed = true;
       this.containerRef.dispose();
     })