From ab8985c8603037166243ca45477e0907856bff3f Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Tue, 3 Nov 2015 10:49:51 -0600
Subject: [PATCH] update(angular): alpha.45

---
 ionic/components/app/structure.scss           |  6 +++-
 .../components/overlay/overlay-controller.ts  |  3 ++
 ionic/transitions/ios-transition.ts           |  3 ++
 ionic/transitions/md-transition.ts            |  3 +-
 package.json                                  |  6 ++--
 scripts/snapshot/snapshot.task.js             | 34 ++++++++-----------
 6 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/ionic/components/app/structure.scss b/ionic/components/app/structure.scss
index 0799024d34..5443d39c3f 100644
--- a/ionic/components/app/structure.scss
+++ b/ionic/components/app/structure.scss
@@ -106,7 +106,7 @@ ion-content-section {
 }
 
 ion-page {
-  display: flex;
+  display: none;
   flex-direction: column;
   position: absolute;
   top: 0;
@@ -114,6 +114,10 @@ ion-page {
   width: 100%;
   height: 100%;
   transform: translateZ(0);
+
+  &.show-page {
+    display: flex;
+  }
 }
 
 ion-content {
diff --git a/ionic/components/overlay/overlay-controller.ts b/ionic/components/overlay/overlay-controller.ts
index 1fbf4e68c6..bc1511cdf5 100644
--- a/ionic/components/overlay/overlay-controller.ts
+++ b/ionic/components/overlay/overlay-controller.ts
@@ -60,6 +60,9 @@ export class OverlayController {
           animation.duration(0);
         }
         animation.before.addClass(overlayType);
+        if (overlayType == 'modal') {
+          animation.before.addClass('show-page');
+        }
 
         this.app.setEnabled(false, animation.duration());
         this.app.setTransitioning(true, animation.duration());
diff --git a/ionic/transitions/ios-transition.ts b/ionic/transitions/ios-transition.ts
index 7ad3499ca1..c971856f82 100644
--- a/ionic/transitions/ios-transition.ts
+++ b/ionic/transitions/ios-transition.ts
@@ -31,6 +31,9 @@ class IOSTransition extends Animation {
     let enteringHasNavbar = enteringView.hasNavbar();
     let leavingHasNavbar = leavingView && leavingView.hasNavbar();
 
+    let enteringPage = new Animation(enteringView.pageRef());
+    enteringPage.before.addClass('show-page');
+    this.add(enteringPage);
 
     // entering content
     let enteringContent = new Animation(enteringView.contentRef());
diff --git a/ionic/transitions/md-transition.ts b/ionic/transitions/md-transition.ts
index b274f62749..d09d57ee67 100644
--- a/ionic/transitions/md-transition.ts
+++ b/ionic/transitions/md-transition.ts
@@ -26,6 +26,7 @@ class MDTransition extends Animation {
 
     // entering content item moves in bottom to center
     let enteringPage = new Animation(enteringView.pageRef());
+    enteringPage.before.addClass('show-page');
     this.add(enteringPage);
 
     if (backDirection) {
@@ -46,7 +47,7 @@ class MDTransition extends Animation {
         enteringBackButton.before.addClass(SHOW_BACK_BTN_CSS);
       } else {
         enteringBackButton.before.removeClass(SHOW_BACK_BTN_CSS);
-      }  
+      }
     }
 
     // setup leaving view
diff --git a/package.json b/package.json
index 5ee911cfe0..8a1f8d4b78 100644
--- a/package.json
+++ b/package.json
@@ -20,14 +20,14 @@
     "tooling"
   ],
   "dependencies": {
-    "@reactivex/rxjs": "5.0.0-alpha.4",
-    "angular2": "2.0.0-alpha.44",
+    "@reactivex/rxjs": "5.0.0-alpha.7",
+    "angular2": "2.0.0-alpha.45",
     "colors": "^1.1.2",
     "es6-shim": "0.33.6",
     "inquirer": "0.11.0",
     "lodash": "3.10.1",
     "q": "1.4.1",
-    "reflect-metadata": "0.1.1",
+    "reflect-metadata": "0.1.2",
     "shelljs": "0.5.3",
     "zone.js": "0.5.8"
   },
diff --git a/scripts/snapshot/snapshot.task.js b/scripts/snapshot/snapshot.task.js
index 1112c2663f..07a934d979 100644
--- a/scripts/snapshot/snapshot.task.js
+++ b/scripts/snapshot/snapshot.task.js
@@ -47,18 +47,16 @@ module.exports = function(gulp, argv, buildConfig) {
     snapshotValues.params.upload = !quickMode;
 
     var protractorArgs = [
-      '--browser <%= browser %>',
-      '--platform <%= platform %>',
-      '--params.platform_id=<%= params.platform_id %>',
-      '--params.platform_index=<%= params.platform_index %>',
-      '--params.platform_count=<%= params.platform_count %>',
-      '--params.width=<%= params.width %>',
-      '--params.height=<%= params.height %>',
-      '--params.test_id=<%= params.test_id %>',
-      '--params.upload=<%= params.upload %>',
-    ].map(function(argument) {
-      return _.template(argument, snapshotValues);
-    });
+      '--browser ' + snapshotValues.browser,
+      '--platform ' + snapshotValues.platform,
+      '--params.platform_id=' +  snapshotValues.params.platform_id,
+      '--params.platform_index=' +  snapshotValues.params.platform_index,
+      '--params.platform_count=' +  snapshotValues.params.platform_count,
+      '--params.width=' +  snapshotValues.params.width,
+      '--params.height=' +  snapshotValues.params.height,
+      '--params.test_id=' +  snapshotValues.params.test_id,
+      '--params.upload=' +  snapshotValues.params.upload
+    ];
 
     e2ePublish(testId, false);
 
@@ -70,16 +68,14 @@ module.exports = function(gulp, argv, buildConfig) {
       stdio: [process.stdin, process.stdout, 'pipe']
     });
 
-    var finish = _.once(function(err) {
-      err && done(err) || done();
+    child.stderr.on('data', function(data) {
       protractorHttpServer.close();
+      done('Protractor tests failed. Error:', data.toString());
     });
 
-    child.stderr.on('data', function(data) {
-      finish('Protractor tests failed. Error:', data.toString());
-    });
     child.on('exit', function() {
-      finish();
+      protractorHttpServer.close();
+      done();
     });
   }
 
@@ -94,7 +90,7 @@ module.exports = function(gulp, argv, buildConfig) {
     var chars = 'abcdefghijklmnopqrstuvwxyz';
     var id = chars.charAt(Math.floor(Math.random() * chars.length));
     chars += '0123456789';
-    while (id.length < 3) {
+    while (id.length < 4) {
       id += chars.charAt(Math.floor(Math.random() * chars.length));
     }
     return id;