refactor($route): consolidate route locals processing into a single handler

Author: petebacondarwin

src/ngRoute/route.js

@@ -606,16 +606,7 @@ function $RouteProvider() {
         }
 
         $q.when(nextRoute).
-          then(function() {
-            if (nextRoute) {
-              var locals = resolveLocalsFor(nextRoute);
-              var template = getTemplateFor(nextRoute);
-              if (angular.isDefined(template)) {
-                locals['$template'] = template;
-              }
-              return $q.all(locals);
-            }
-          }).
+          then(resolveLocals).
           then(function(locals) {
             // after route change
             if (nextRoute === $route.current) {
@@ -633,14 +624,20 @@ function $RouteProvider() {
       }
     }
 
-    function resolveLocalsFor(route) {
-      var locals = angular.extend({}, route.resolve);
-      angular.forEach(locals, function(value, key) {
-        locals[key] = angular.isString(value) ?
-            $injector.get(value) :
-            $injector.invoke(value, null, null, key);
-      });
-      return locals;
+    function resolveLocals(route) {
+      if (route) {
+        var locals = angular.extend({}, route.resolve);
+        angular.forEach(locals, function(value, key) {
+          locals[key] = angular.isString(value) ?
+              $injector.get(value) :
+              $injector.invoke(value, null, null, key);
+        });
+        var template = getTemplateFor(route);
+        if (angular.isDefined(template)) {
+          locals['$template'] = template;
+        }
+        return $q.all(locals);
+      }
     }