fix(viewDirective): add check for componentProvider

mlnkw · web-flow · commit f087d5ee6cdd · 2019-06-09T23:57:30.000+03:00
avoid extra trigger for $onInit (fixing angular-ui#3735)
diff --git a/src/directives/viewDirective.ts b/src/directives/viewDirective.ts
@@ -465,7 +465,7 @@ function registerControllerCallbacks(
   cfg: Ng1ViewConfig
 ) {
   // Call $onInit() ASAP
-  if (isFunction(controllerInstance.$onInit) && !(cfg.viewDecl.component && hasComponentImpl)) {
+  if (isFunction(controllerInstance.$onInit) && !((cfg.viewDecl.component || cfg.viewDecl.componentProvider) && hasComponentImpl)) {
     controllerInstance.$onInit();
   }
 

Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,7 @@ function registerControllerCallbacks(`
`465`	`465`	`cfg: Ng1ViewConfig`
`466`	`466`	`) {`
`467`	`467`	`// Call $onInit() ASAP`
`468`		`- if (isFunction(controllerInstance.$onInit) && !(cfg.viewDecl.component && hasComponentImpl)) {`
	`468`	`+ if (isFunction(controllerInstance.$onInit) && !((cfg.viewDecl.component \|\| cfg.viewDecl.componentProvider) && hasComponentImpl)) {`
`469`	`469`	`controllerInstance.$onInit();`
`470`	`470`	`}`
`471`	`471`