perf($compile): simplifying/refactoring controller loops/methods

Author: jbedard

src/ng/compile.js

@@ -1671,7 +1671,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 
         if (!directive.templateUrl && directive.controller) {
           directiveValue = directive.controller;
-          controllerDirectives = controllerDirectives || {};
+          controllerDirectives = controllerDirectives || createMap();
           assertNoDuplicate("'" + directiveName + "' controller",
               controllerDirectives[directiveName], directive, $compileNode);
           controllerDirectives[directiveName] = directive;
@@ -1839,49 +1839,43 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 
 
       function getControllers(directiveName, require, $element, elementControllers) {
-        var value, retrievalMethod = 'data', optional = false;
-        var $searchElement = $element;
-        var match;
-        if (isString(require)) {
-          match = require.match(REQUIRE_PREFIX_REGEXP);
-          require = require.substring(match[0].length);
-
-          if (match[3]) {
-            if (match[1]) match[3] = null;
-            else match[1] = match[3];
-          }
-          if (match[1] === '^') {
-            retrievalMethod = 'inheritedData';
-          } else if (match[1] === '^^') {
-            retrievalMethod = 'inheritedData';
-            $searchElement = $element.parent();
-          }
-          if (match[2] === '?') {
-            optional = true;
-          }
+        var i, value;
 
-          value = null;
+        if (typeof require === 'string') {
+          var match = require.match(REQUIRE_PREFIX_REGEXP);
+          var name = require.substring(match[0].length);
+          var type = match[1] || match[3];
 
-          if (elementControllers && retrievalMethod === 'data') {
-            if (value = elementControllers[require]) {
-              value = value.instance;
-            }
+          //If only parents then start at the parent element
+          //Otherwise attempt getting the controller from elementControllers to avoid .data
+          if (type === '^^') {
+            $element = $element.parent();
+          } else {
+            value = elementControllers && elementControllers[name];
+            value = value && value.instance;
           }
-          value = value || $searchElement[retrievalMethod]('$' + require + 'Controller');
 
-          if (!value && !optional) {
+          if (!value) {
+            var dataName = '$' + name + 'Controller';
+            value = type ? $element.inheritedData(dataName) : $element.data(dataName);
+          }
+
+          if (!value && match[2] !== '?') {
             throw $compileMinErr('ctreq',
                 "Controller '{0}', required by directive '{1}', can't be found!",
-                require, directiveName);
+                name, directiveName);
           }
+
           return value || null;
-        } else if (isArray(require)) {
-          value = [];
-          forEach(require, function(require) {
-            value.push(getControllers(directiveName, require, $element, elementControllers));
-          });
         }
-        return value;
+
+        if (isArray(require)) {
+          value = new Array(i = require.length);
+          while (i--) {
+            value[i] = getControllers(directiveName, require[i], $element, elementControllers);
+          }
+          return value;
+        }
       }
 
 
@@ -1910,32 +1904,37 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
         }
 
         if (controllerDirectives) {
-          elementControllers = {};
-          forEach(controllerDirectives, function(directive) {
+          elementControllers = createMap();
+
+          // 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
-            }, controllerInstance;
+            };
 
-            controller = directive.controller;
-            if (controller == '@') {
-              controller = attrs[directive.name];
+            var directiveController = directive.controller;
+            if (directiveController === '@') {
+              directiveController = attrs[directive.name];
             }
 
-            controllerInstance = $controller(controller, locals, true, directive.controllerAs);
+            var controllerInstance = $controller(directiveController, locals, true, directive.controllerAs);
 
-            // 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.
             elementControllers[directive.name] = controllerInstance;
-            if (!hasElementTranscludeDirective) {
-              $element.data('$' + directive.name + 'Controller', controllerInstance.instance);
+            if (controllerData) {
+              controllerData['$' + directive.name + 'Controller'] = controllerInstance.instance;
             }
-          });
+          }
         }
 
         if (newIsolateScopeDirective) {
@@ -1965,7 +1964,9 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
                                               bindings, scopeDirective);
             }
           }
-          forEach(elementControllers, function(controller) {
+          // Initialize the controllers before linking
+          for (i in elementControllers) {
+            controller = elementControllers[i];
             var result = controller();
             if (result !== controller.instance &&
                 controller === controllerForBindings) {
@@ -1975,7 +1976,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
                   initializeDirectiveBindings(scope, attrs, result,
                                               bindings, scopeDirective);
             }
-          });
+          }
         }
 
         // PRELINKING