fix(elements): initialization should run in ngZone (angular#24181)

remackgeek · remackgeek · commit 60a8ebb7b829 · 2018-05-29T14:23:29.000-07:00
diff --git a/packages/elements/src/component-factory-strategy.ts b/packages/elements/src/component-factory-strategy.ts
@@ -89,7 +89,12 @@ export class ComponentNgElementStrategy implements NgElementStrategy {
 
     if (!this.componentRef) {
       let initializeComponentFn = () => { this.initializeComponent(element); };
+<<<<<<< HEAD
       NgZone.isInAngularZone() ? initializeComponentFn() : this.ngZone.run(initializeComponentFn);
+=======
+      NgZone.isInAngularZone() ? initializeComponentFn() :
+                                      this.ngZone.run(initializeComponentFn);
+>>>>>>> 5b5dfdd4add9276950e9ce9b76760382ea57a57e
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,12 @@ export class ComponentNgElementStrategy implements NgElementStrategy {`
`89`	`89`
`90`	`90`	`if (!this.componentRef) {`
`91`	`91`	`let initializeComponentFn = () => { this.initializeComponent(element); };`
	`92`	`+<<<<<<< HEAD`
`92`	`93`	`NgZone.isInAngularZone() ? initializeComponentFn() : this.ngZone.run(initializeComponentFn);`
	`94`	`+=======`
	`95`	`+ NgZone.isInAngularZone() ? initializeComponentFn() :`
	`96`	`+ this.ngZone.run(initializeComponentFn);`
	`97`	`+>>>>>>> 5b5dfdd4add9276950e9ce9b76760382ea57a57e`
`93`	`98`	`}`
`94`	`99`	`}`
`95`	`100`