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
+39
−1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| if (scopeDirective && elementControllers[scopeDirective.name]) { | ||
| bindings = scopeDirective.$$bindings.bindToController; | ||
| controller = elementControllers[scopeDirective.name]; | ||
| controller = scopeController = elementControllers[scopeDirective.name]; |
There was a problem hiding this comment.
I don't know what else scopeDirective can be, so scopeController might not be the best name.
Narretz
force-pushed
the
fix-controller-return
branch
from
b28c662 to
d4acbf0
Compare
|
@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. |
| controller.instance = controllerResult; | ||
| $element.data('$' + directive.name + 'Controller', controllerResult); | ||
| $element.data('$' + i + 'Controller', controllerResult); |
There was a problem hiding this comment.
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.
|
lgtm |
Narretz
force-pushed
the
fix-controller-return
branch
from
d4acbf0 to
98a1717
Compare
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #12029