fix($route): support inline annotation on .resolve

angular · Sep 12, 2012 · b0a05a7 · b0a05a7 · petebacondarwin · Sep 18, 2012
1 parent 209b67d
commit b0a05a7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/ng/route.js b/src/ng/route.js
@@ -373,7 +373,7 @@ function $RouteProvider(){
 
               forEach(next.resolve || {}, function(value, key) {
                 keys.push(key);
-                values.push(isFunction(value) ? $injector.invoke(value) : $injector.get(value));
+                values.push(isString(value) ? $injector.get(value) : $injector.invoke(value));
               });
               if (isDefined(template = next.template)) {
               } else if (isDefined(template = next.templateUrl)) {

diff --git a/test/ng/routeSpec.js b/test/ng/routeSpec.js
@@ -232,10 +232,10 @@ describe('$route', function() {
           return deferB.promise;
         });
         $routeProvider.when('/path', { templateUrl: 'foo.html', resolve: {
-          a: function($q) {
+          a: ['$q', function($q) {
             deferA = $q.defer();
             return deferA.promise;
-          },
+          }],
           b: 'b'
         } });
       });
@@ -434,8 +434,8 @@ describe('$route', function() {
       });
     });
   });
-  
-  
+
+
   it('should match route with and without trailing slash', function() {
     module(function($routeProvider){
       $routeProvider.when('/foo', {templateUrl: 'foo.html'});