refactor($compile): moving controller setup into its own method

jbedard · jbedard · commit 89a4f89971fa · 2014-11-27T22:37:54.000-08:00
diff --git a/src/ng/compile.js b/src/ng/compile.js
@@ -1808,10 +1808,41 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
         }
       }
 
+      function setupControllers(scope, isolateScope, $element, attrs, transcludeFn, elementControllers) {
+        // For directives with element transclusion the element is a comment,
+        // but jQuery .data doesn't support attaching data to comment nodes as it's hard to
+        // clean up (http://bugs.jquery.com/ticket/8335).
+        // Instead, we save the controllers for the element in a local hash and attach to .data
+        // later, once we have the actual element.
+        var controllerData = !hasElementTranscludeDirective && $element.data();
+
+        for (var directiveName in controllerDirectives) {
+          var directive = controllerDirectives[directiveName];
+
+          var locals = {
+            $scope: directive === newIsolateScopeDirective || directive.$$isolateScope ? isolateScope : scope,
+            $element: $element,
+            $attrs: attrs,
+            $transclude: transcludeFn
+          };
+
+          var controller = directive.controller;
+          if (controller === '@') {
+            controller = attrs[directive.name];
+          }
+
+          var controllerInstance = $controller(controller, locals, true, directive.controllerAs);
+
+          elementControllers[directive.name] = controllerInstance;
+          if (controllerData) {
+            controllerData['$' + directive.name + 'Controller'] = controllerInstance.instance;
+          }
+        }
+      }
+
 
       function nodeLinkFn(childLinkFn, scope, linkNode, $rootElement, boundTranscludeFn) {
-        var i, ii, linkFn, directive, controller, isolateScope, elementControllers, transcludeFn, $element,
-            attrs;
+        var i, ii, linkFn, isolateScope, elementControllers, transcludeFn, $element, attrs;
 
         if (compileNode === linkNode) {
           attrs = templateAttrs;
@@ -1833,37 +1864,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
         }
 
         if (controllerDirectives) {
-          elementControllers = {};
-
-          // For directives with element transclusion the element is a comment,
-          // but jQuery .data doesn't support attaching data to comment nodes as it's hard to
-          // clean up (http://bugs.jquery.com/ticket/8335).
-          // Instead, we save the controllers for the element in a local hash and attach to .data
-          // later, once we have the actual element.
-          var controllerData = !hasElementTranscludeDirective && $element.data();
-
-          for (var directiveName in controllerDirectives) {
-            var directive = controllerDirectives[directiveName];
-
-            var locals = {
-              $scope: directive === newIsolateScopeDirective || directive.$$isolateScope ? isolateScope : scope,
-              $element: $element,
-              $attrs: attrs,
-              $transclude: transcludeFn
-            };
-
-            var controller = directive.controller;
-            if (controller === '@') {
-              controller = attrs[directive.name];
-            }
-
-            var controllerInstance = $controller(controller, locals, true, directive.controllerAs);
-
-            elementControllers[directive.name] = controllerInstance;
-            if (controllerData) {
-              controllerData['$' + directive.name + 'Controller'] = controllerInstance.instance;
-            }
-          }
+          setupControllers(scope, isolateScope, $element, attrs, transcludeFn, elementControllers = {});
         }
 
         if (newIsolateScopeDirective) {
@@ -1951,8 +1952,8 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
         }
 
         // Initialize the controllers before linking
-        for (i in elementControllers) {
-          elementControllers[i]();
+        if (elementControllers) {
+          invokeEach(elementControllers);
         }
 
         // PRELINKING
@@ -2011,6 +2012,12 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
       }
     }
 
+    function invokeEach(funcs) {
+      for (var key in funcs) {
+        funcs[key]();
+      }
+    }
+
     function markDirectivesAsIsolate(directives) {
       // mark all directives as needing isolate scope.
       for (var j = 0, jj = directives.length; j < jj; j++) {
