From 9f148d213ba11ace9bbca41f9b47451500ba327c Mon Sep 17 00:00:00 2001 From: Jason Bedard Date: Sat, 28 Nov 2015 13:24:03 -0800 Subject: [PATCH] refactor($compile): move setting of controller data to single location --- src/ng/compile.js | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/ng/compile.js b/src/ng/compile.js index 18ecce99dc92..beb0b21402c3 100644 --- a/src/ng/compile.js +++ b/src/ng/compile.js @@ -2319,12 +2319,13 @@ function $CompileProvider($provide, $$sanitizeUriProvider) { } } - // Initialize bindToController bindings + // Initialize controllers for (var name in elementControllers) { var controllerDirective = controllerDirectives[name]; var controller = elementControllers[name]; var bindings = controllerDirective.$$bindings.bindToController; + // Initialize bindToController bindings if (controller.identifier && bindings) { removeControllerBindingWatches = initializeDirectiveBindings(controllerScope, attrs, controller.instance, bindings, controllerDirective); @@ -2335,11 +2336,14 @@ function $CompileProvider($provide, $$sanitizeUriProvider) { // If the controller constructor has a return value, overwrite the instance // from setupControllers controller.instance = controllerResult; - $element.data('$' + controllerDirective.name + 'Controller', controllerResult); removeControllerBindingWatches && removeControllerBindingWatches(); removeControllerBindingWatches = initializeDirectiveBindings(controllerScope, attrs, controller.instance, bindings, controllerDirective); } + + // Store controllers on the $element data + // For transclude comment nodes this will be a noop and will be done at transclusion time + $element.data('$' + controllerDirective.name + 'Controller', controllerResult); } // Bind the required controllers to the controller, if `require` is an object and `bindToController` is truthy @@ -2489,14 +2493,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) { controller = attrs[directive.name]; } - var controllerInstance = $controller(controller, locals, true, directive.controllerAs); - - // For directives with element transclusion the element is a comment. - // In this case .data will not attach any data. - // Instead, we save the controllers for the element in a local hash and attach to .data - // later, once we have the actual element. - elementControllers[directive.name] = controllerInstance; - $element.data('$' + directive.name + 'Controller', controllerInstance.instance); + elementControllers[directive.name] = $controller(controller, locals, true, directive.controllerAs); } return elementControllers; } pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy