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

fix for #11343 - bindToController for multiple directives #11344

Closed
wants to merge 2 commits into from
Closed

fix for #11343 - bindToController for multiple directives #11344

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
413c8b6
fix for #11343 - bindToController for multiple directives
jtorbicki Mar 17, 2015
bb5fc2f
fix for #11343 - bindToController for multiple directives. Out of sco…
jtorbicki Mar 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions src/ng/compile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1960,31 +1960,30 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
newIsolateScopeDirective, isolateScope);
}
if (elementControllers) {
// Initialize bindToController bindings for new/isolate scopes
var scopeDirective = newIsolateScopeDirective || newScopeDirective;
var bindings;
var controllerForBindings;
if (scopeDirective && elementControllers[scopeDirective.name]) {
bindings = scopeDirective.$$bindings.bindToController;
controller = elementControllers[scopeDirective.name];

if (controller && controller.identifier && bindings) {
controllerForBindings = controller;
thisLinkFn.$$destroyBindings =
for (i in elementControllers) {
// Initialize bindToController bindings for new/isolate scopes
var scopeDirective = newIsolateScopeDirective || controllerDirectives[i];
Copy link
Contributor

Choose a reason for hiding this comment

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

This does not look right - if newIsolateScopeDirective exists, it will just use that N times.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If you try to combine scope: {} with scope: true on the same element you'll get an error earlier:

Multiple directives [first, second] asking for new/isolated scope on: <div first="{{1+1}}" second="{{2+2}}">

So it's either one iteration for isolated scope, or multiple for scope: true

var bindings;
var controllerForBindings;
if (scopeDirective && elementControllers[scopeDirective.name]) {
bindings = scopeDirective.$$bindings.bindToController;
controller = elementControllers[scopeDirective.name];
if (controller && controller.identifier && bindings) {
controllerForBindings = controller;
thisLinkFn.$$destroyBindings =
initializeDirectiveBindings(scope, attrs, controller.instance,
bindings, scopeDirective);
bindings, scopeDirective);
}
}
}
for (i in elementControllers) {
controller = elementControllers[i];
var controllerResult = controller();
if (controllerResult !== controller.instance &&
controller === controllerForBindings) {
controller === controllerForBindings) {
// Remove and re-install bindToController bindings
thisLinkFn.$$destroyBindings();
thisLinkFn.$$destroyBindings =
initializeDirectiveBindings(scope, attrs, controllerResult,
bindings, scopeDirective);
initializeDirectiveBindings(scope, attrs, controllerResult,
bindings, scopeDirective);
}
}
}
Expand Down