fix(core): should check Zone existance when scheduleMicroTask (#20656)

JiaLiPassion · alxhub · commit aa9ba7f9fe32 · 2018-02-02T07:53:55.000-08:00
PR Close #20656
diff --git a/packages/core/src/util.ts b/packages/core/src/util.ts
@@ -21,6 +21,8 @@ const __self = typeof self !== 'undefined' && typeof WorkerGlobalScope !== 'unde
     self instanceof WorkerGlobalScope && self;
 const __global = typeof global !== 'undefined' && global;
 const _global: {[name: string]: any} = __window || __global || __self;
+
+const promise: Promise<any> = Promise.resolve(0);
 /**
  * Attention: whenever providing a new value, be sure to add an
  * entry into the corresponding `....externs.js` file,
@@ -52,7 +54,12 @@ export function getSymbolIterator(): string|symbol {
 }
 
 export function scheduleMicroTask(fn: Function) {
-  Zone.current.scheduleMicroTask('scheduleMicrotask', fn);
+  if (typeof Zone === 'undefined') {
+    // use promise to schedule microTask instead of use Zone
+    promise.then(() => { fn && fn.apply(null, null); });
+  } else {
+    Zone.current.scheduleMicroTask('scheduleMicrotask', fn);
+  }
 }
 
 // JS has NaN !== NaN
diff --git a/packages/platform-browser/animations/src/animation_renderer.ts b/packages/platform-browser/animations/src/animation_renderer.ts
@@ -19,6 +19,7 @@ export class AnimationRendererFactory implements RendererFactory2 {
   private _animationCallbacksBuffer: [(e: any) => any, any][] = [];
   private _rendererCache = new Map<Renderer2, BaseAnimationRenderer>();
   private _cdRecurDepth = 0;
+  private promise: Promise<any> = Promise.resolve(0);
 
   constructor(
       private delegate: RendererFactory2, private engine: AnimationEngine, private _zone: NgZone) {
@@ -69,7 +70,8 @@ export class AnimationRendererFactory implements RendererFactory2 {
   }
 
   private _scheduleCountTask() {
-    Zone.current.scheduleMicroTask('incremenet the animation microtask', () => this._microtaskId++);
+    // always use promise to schedule microtask instead of use Zone
+    this.promise.then(() => { this._microtaskId++; });
   }
 
   /* @internal */

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ export class AnimationRendererFactory implements RendererFactory2 {`
`19`	`19`	`private _animationCallbacksBuffer: [(e: any) => any, any][] = [];`
`20`	`20`	`private _rendererCache = new Map<Renderer2, BaseAnimationRenderer>();`
`21`	`21`	`private _cdRecurDepth = 0;`
	`22`	`+ private promise: Promise<any> = Promise.resolve(0);`
`22`	`23`
`23`	`24`	`constructor(`
`24`	`25`	`private delegate: RendererFactory2, private engine: AnimationEngine, private _zone: NgZone) {`
`@@ -69,7 +70,8 @@ export class AnimationRendererFactory implements RendererFactory2 {`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`private _scheduleCountTask() {`
`72`		`- Zone.current.scheduleMicroTask('incremenet the animation microtask', () => this._microtaskId++);`
	`73`	`+ // always use promise to schedule microtask instead of use Zone`
	`74`	`+ this.promise.then(() => { this._microtaskId++; });`
`73`	`75`	`}`
`74`	`76`
`75`	`77`	`/* @internal */`