refactor($compile): combining elementControllers and controllers

Author: jbedard

src/ng/compile.js

@@ -1506,7 +1506,6 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
       var terminalPriority = -Number.MAX_VALUE,
           newScopeDirective,
           controllerDirectives = previousCompileContext.controllerDirectives,
-          controllers,
           newIsolateScopeDirective = previousCompileContext.newIsolateScopeDirective,
           templateDirective = previousCompileContext.templateDirective,
           nonTlbTranscludeDirective = previousCompileContext.nonTlbTranscludeDirective,
@@ -1796,9 +1795,8 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
 
         transcludeFn = boundTranscludeFn && controllersBoundTransclude;
         if (controllerDirectives) {
-          // TODO: merge `controllers` and `elementControllers` into single object.
-          controllers = {};
           elementControllers = {};
+
           forEach(controllerDirectives, function nodeLinkControllers(directive) {
             var locals = {
               $scope: directive === newIsolateScopeDirective || directive.$$isolateScope ? isolateScope : scope,
@@ -1823,8 +1821,6 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
             if (!hasElementTranscludeDirective) {
               $element.data('$' + directive.name + 'Controller', controllerInstance.instance);
             }
-
-            controllers[directive.name] = controllerInstance;
           });
         }
 
@@ -1833,7 +1829,7 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
               templateDirective === newIsolateScopeDirective.$$originalDirective)));
           compile.$$addScopeClass($element, true);
 
-          var isolateScopeController = controllers && controllers[newIsolateScopeDirective.name];
+          var isolateScopeController = elementControllers && elementControllers[newIsolateScopeDirective.name];
           var isolateBindingContext = isolateScope;
           if (isolateScopeController && isolateScopeController.identifier &&
               newIsolateScopeDirective.bindToController === true) {
@@ -1911,11 +1907,11 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
             }
           });
         }
-        if (controllers) {
-          forEach(controllers, function nodeLinkInitController(controller) {
+
+        if (elementControllers) {
+          forEach(elementControllers, function nodeLinkInitController(controller) {
             controller();
           });
-          controllers = null;
         }
 
         // PRELINKING