diff options
| -rw-r--r-- | src/ng/route.js | 2 | ||||
| -rw-r--r-- | test/ng/routeSpec.js | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/ng/route.js b/src/ng/route.js index 1e9fc1db..e2a9c633 100644 --- 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 index 31d932f7..0e98be5f 100644 --- 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'}); |