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

refactor($compile): combining elementControllers and controllers vars #11058

Closed
wants to merge 1 commit into from
Closed

refactor($compile): combining elementControllers and controllers vars #11058

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 4 additions & 10 deletions src/ng/compile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1614,7 +1614,6 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
var terminalPriority = -Number.MAX_VALUE,
newScopeDirective,
controllerDirectives = previousCompileContext.controllerDirectives,
controllers,
newIsolateScopeDirective = previousCompileContext.newIsolateScopeDirective,
templateDirective = previousCompileContext.templateDirective,
nonTlbTranscludeDirective = previousCompileContext.nonTlbTranscludeDirective,
Expand Down Expand Up @@ -1911,8 +1910,6 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
}

if (controllerDirectives) {
// TODO: merge `controllers` and `elementControllers` into single object.
controllers = {};
elementControllers = {};
forEach(controllerDirectives, function(directive) {
var locals = {
Expand All @@ -1938,8 +1935,6 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
if (!hasElementTranscludeDirective) {
$element.data('$' + directive.name + 'Controller', controllerInstance.instance);
}

controllers[directive.name] = controllerInstance;
});
}

Expand All @@ -1954,14 +1949,14 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
isolateScope.$$isolateBindings,
newIsolateScopeDirective, isolateScope);
}
if (controllers) {
if (elementControllers) {
// Initialize bindToController bindings for new/isolate scopes
var scopeDirective = newIsolateScopeDirective || newScopeDirective;
var bindings;
var controllerForBindings;
if (scopeDirective && controllers[scopeDirective.name]) {
if (scopeDirective && elementControllers[scopeDirective.name]) {
bindings = scopeDirective.$$bindings.bindToController;
controller = controllers[scopeDirective.name];
controller = elementControllers[scopeDirective.name];

if (controller && controller.identifier && bindings) {
controllerForBindings = controller;
Expand All @@ -1970,7 +1965,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
bindings, scopeDirective);
}
}
forEach(controllers, function(controller) {
forEach(elementControllers, function(controller) {
var result = controller();
if (result !== controller.instance &&
controller === controllerForBindings) {
Expand All @@ -1981,7 +1976,6 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
bindings, scopeDirective);
}
});
controllers = null;
}

// PRELINKING
Expand Down