Commitc3e87ad

authored and

committed

fix(viewDirective): add check for componentProvider, avoid extra trigger for $onInit (fixing#3735) (#3779)

1 parent74772bd commitc3e87adCopy full SHA for c3e87ad

File tree

+23

-1

lines changed

+23

-1

lines changed

Lines changed: 1 addition & 1 deletion

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`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1334,6 +1334,28 @@ describe('angular 1.5+ style .component()', function() {`
`1334`	`1334`	`expect(log).toBe('onInit;');`
`1335`	`1335`	`});`
`1336`	`1336`
	`1337`	`+it('should only call $onInit() once with componentProvider',function(){`
	`1338`	`+$stateProvider.state('route2cmp',{`
	`1339`	`+componentProvider:()=>'ngComponent',`
	`1340`	`+resolve:{`
	`1341`	`+data:function(){`
	`1342`	`+return'DATA!';`
	`1343`	`+},`
	`1344`	`+},`
	`1345`	`+});`
	`1346`	`+`
	`1347`	`+const$state=svcs.$state,`
	`1348`	`+$httpBackend=svcs.$httpBackend,`
	`1349`	`+$q=svcs.$q;`
	`1350`	`+`
	`1351`	`+$httpBackend.expectGET('/comp_tpl.html').respond('-{{ $ctrl.data }}-');`
	`1352`	`+$state.transitionTo('route2cmp');`
	`1353`	`+$q.flush();`
	`1354`	`+$httpBackend.flush();`
	`1355`	`+`
	`1356`	`+expect(log).toBe('onInit;');`
	`1357`	`+});`
	`1358`	`+`
`1337`	`1359`	`it('should supply resolve data to "<", "=", "@" bindings',function(){`
`1338`	`1360`	`$stateProvider.state('bindingtypes',{`
`1339`	`1361`	`component:'bindingTypes',`

Comments

(0)