From 64fb48ac6054fe12b26f4ba8509faed4a03a71e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=A1ko=20Hevery?= <misko@hevery.com>
Date: Fri, 20 Feb 2015 21:12:15 +0000
Subject: [PATCH] fixed zone.js

---
 components/app.js |  9 ++-------
 index.html        | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/components/app.js b/components/app.js
index 106e5f4..ef2614a 100644
--- a/components/app.js
+++ b/components/app.js
@@ -1,5 +1,4 @@
 import * as ng from 'angular2/angular2';
-import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle';
 import {Video} from 'components/video';
 import {YoutubeService} from 'services/youtube';
 
@@ -13,13 +12,9 @@ import {YoutubeService} from 'services/youtube';
 })
 export class YoutubeApp {
   videos;
-  constructor(lc: LifeCycle, yt: YoutubeService) {
+  constructor(yt: YoutubeService) {
     this.videos = [];
-    this.lc = lc;
-    yt.init().then((videos) => {
-      this.videos = videos;
-      lc.tick();  // investigate why needed?
-    });
+    yt.init().then((videos) => this.videos = videos);
   }
 }
 
diff --git a/index.html b/index.html
index aa57df0..4f6747f 100644
--- a/index.html
+++ b/index.html
@@ -34,9 +34,34 @@
     <youtube-app>Loading... Please wait</youtube-app>
     <script>
       System.import('main').then(function(module) {
+        zone = zone.fork(Zone.longStackTraceZone);
         module.main();
       }, console.log.bind(console));
     </script>
+    <script type="text/javascript">
+      function googleClientReady() {
+        /**
+         * This patches the Promise library of the GoogleClient. If it would be using native promises 
+         * this would not be necessary.
+         * 
+         * The issue is that the GoogleClientPromise gets triggerd from a callback which was registered before
+         * angular bootstraped and hence all `then`s execute in the wrong zone. If GoogleClient would use
+         * native Promise, this would not be a problem, but it does not, hence we patch the GoogleClientPromise
+         * to behave the same as native Promise.
+         */
+        gapi.client.load = (function(delegate) {
+          return function(name, ver) {
+            var promise = delegate.call(this, name, ver);
+            Zone.patchPrototype(promise.__proto__, [
+              'then',
+              'catch'
+            ]);
+            gapi.client.load = delegate; // Remove the Promise patch;
+            return promise;
+          }
+        })(gapi.client.load);
+      }
+    </script>
     <script src="https://apis.google.com/js/client.js?onload=googleClientReady"></script>
   </body>
 </html>