Revert "Revert "Merge branch 'master' of https://github.com/driftyco/ionic""

This reverts commit 4a6086c1f8.

src/components/modal/test/basic/index.ts

@@ -1,12 +1,12 @@
 import { Component, Injectable } from '@angular/core';
 
-import { ActionSheetController, Config, ionicBootstrap, ModalController, NavController, NavParams, PageTransition, Platform, TransitionOptions, ViewController } from '../../../../../src';
+import { ActionSheetController, App, Config, ionicBootstrap, ModalController, NavController, NavParams, PageTransition, Platform, TransitionOptions, ViewController } from '../../../../../src';
 
 
 @Injectable()
 class SomeComponentProvider {
   constructor(private config: Config) {
-    console.log('SomeComponentProvider constructor')
+    console.log('SomeComponentProvider constructor');
   }
 
   getName() {
@@ -17,7 +17,7 @@ class SomeComponentProvider {
 @Injectable()
 class SomeAppProvider {
   constructor(private config: Config) {
-    console.log('SomeAppProvider constructor')
+    console.log('SomeAppProvider constructor');
   }
 
   getData() {
@@ -84,7 +84,7 @@ class E2EPage {
   }
 
   presentModalWithInputs() {
-	  let modal = this.modalCtrl.create(ModalWithInputs);
+    let modal = this.modalCtrl.create(ModalWithInputs);
     modal.onDidDismiss((data: any) => {
       console.log('Modal with inputs data:', data);
     });
@@ -98,7 +98,7 @@ class E2EPage {
     });
   }
 
-  presentNavigableModal(){
+  presentNavigableModal() {
     this.modalCtrl.create(NavigableModal).present();
   }
 }
@@ -117,11 +117,11 @@ class E2EPage {
   `
 })
 class NavigableModal {
-  constructor(private navController:NavController) {
+  constructor(private nav: NavController) {
   }
 
   submit(){
-    this.navController.push(NavigableModal2);
+    this.nav.push(NavigableModal2);
   }
 }
 
@@ -139,10 +139,10 @@ class NavigableModal {
   `
 })
 class NavigableModal2 {
-  constructor(private navController:NavController) {
+  constructor(private navController: NavController) {
   }
 
-  submit(){
+  submit() {
     this.navController.pop();
   }
 }
@@ -188,23 +188,23 @@ class ModalPassData {
     this.viewCtrl.dismiss(this.data);
   }
 
-  ionViewLoaded(){
+  ionViewLoaded() {
     console.log('ModalPassData ionViewLoaded fired');
   }
 
-  ionViewWillEnter(){
+  ionViewWillEnter() {
     console.log('ModalPassData ionViewWillEnter fired');
   }
 
-  ionViewDidEnter(){
+  ionViewDidEnter() {
     console.log('ModalPassData ionViewDidEnter fired');
   }
 
-  ionViewWillLeave(){
+  ionViewWillLeave() {
     console.log('ModalPassData ionViewWillLeave fired');
   }
 
-  ionViewDidLeave(){
+  ionViewDidLeave() {
     console.log('ModalPassData ionViewDidLeave fired');
   }
 }
@@ -375,10 +375,10 @@ class ContactUs {
 })
 class ModalFirstPage {
 
-  private items:any[];
-  constructor(private nav: NavController, private actionSheetCtrl: ActionSheetController) {
+  private items: any[];
+  constructor(private nav: NavController, private app: App, private actionSheetCtrl: ActionSheetController) {
     this.items = [];
-    for ( let i = 0; i < 50; i++ ){
+    for ( let i = 0; i < 50; i++ ) {
       this.items.push({
         value: (i + 1)
       });
@@ -387,24 +387,24 @@ class ModalFirstPage {
 
   push() {
     let page = ModalSecondPage;
-    let params = { id: 8675309, myData: [1,2,3,4] };
+    let params = { id: 8675309, myData: [1, 2, 3, 4] };
 
     this.nav.push(page, params);
   }
 
   dismiss() {
-    this.nav.rootNav.pop();
+    this.app.getRootNav().pop();
   }
 
-  ionViewLoaded(){
+  ionViewLoaded() {
     console.log('ModalFirstPage ionViewLoaded fired');
   }
 
-  ionViewWillEnter(){
+  ionViewWillEnter() {
     console.log('ModalFirstPage ionViewWillEnter fired');
   }
 
-  ionViewDidEnter(){
+  ionViewDidEnter() {
     console.log('ModalFirstPage ionViewDidEnter fired');
   }
 
@@ -430,8 +430,8 @@ class ModalFirstPage {
             // overlays are added and removed from the root navigation
             // find the root navigation, and pop this alert
             // when the alert is done animating out, then pop off the modal
-            this.nav.rootNav.pop().then(() => {
-              this.nav.rootNav.pop();
+            this.app.getRootNav().pop().then(() => {
+              this.app.getRootNav().pop();
             });
 
             // by default an alert will dismiss itself
@@ -477,15 +477,15 @@ class ModalSecondPage {
     console.log('Second page params:', params);
   }
 
-  ionViewLoaded(){
+  ionViewLoaded() {
     console.log('ModalSecondPage ionViewLoaded');
   }
 
-  ionViewWillEnter(){
+  ionViewWillEnter() {
     console.log('ModalSecondPage ionViewWillEnter');
   }
 
-  ionViewDidEnter(){
+  ionViewDidEnter() {
     console.log('ModalSecondPage ionViewDidEnter');
   }
 }