Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

fix(compile): assign controller return value to correct controller#12036

Closed
Narretz wants to merge 1 commit into
angular:masterfrom
Narretz:fix-controller-return
Closed

fix(compile): assign controller return value to correct controller#12036
Narretz wants to merge 1 commit into
angular:masterfrom
Narretz:fix-controller-return

Conversation

@Narretz
Copy link
Copy Markdown
Contributor

@Narretz Narretz commented Jun 5, 2015

Fixes #12029

Comment thread src/ng/compile.js Outdated
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know what else scopeDirective can be, so scopeController might not be the best name.

@Narretz Narretz force-pushed the fix-controller-return branch from b28c662 to d4acbf0 Compare June 12, 2015 18:38
@Narretz
Copy link
Copy Markdown
Contributor Author

Narretz commented Jun 12, 2015

@caitp Can you check this again? The problem is actually much more general. Basically, the return values for each controller was always updated for the same directive.

Comment thread src/ng/compile.js Outdated
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, maybe the comment could be a bit more clear --- we're overwriting stuff that was done in setupControllers() because the return value was different from the pre-allocated instance.

@caitp
Copy link
Copy Markdown
Contributor

caitp commented Jun 12, 2015

lgtm

@Narretz Narretz force-pushed the fix-controller-return branch from d4acbf0 to 98a1717 Compare June 12, 2015 19:24
@Narretz Narretz closed this in 8caf180 Jun 12, 2015
netman92 pushed a commit to netman92/angular.js that referenced this pull request Aug 8, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants