diff options
| author | Misko Hevery | 2012-09-11 22:10:26 -0700 |
|---|---|---|
| committer | Misko Hevery | 2012-09-11 23:16:41 -0700 |
| commit | 074a354fa975203f2043df28a92c4a8659ef81d0 (patch) | |
| tree | fc5008b24a6455f12564773d61e8363fe6438cde /src/ng | |
| parent | e191582a02196e38d00236dd432748572bd30682 (diff) | |
| download | angular.js-074a354fa975203f2043df28a92c4a8659ef81d0.tar.bz2 | |
fix($route): support inline annotation on .resolve
Diffstat (limited to 'src/ng')
| -rw-r--r-- | src/ng/route.js | 2 |
1 files changed, 1 insertions, 1 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)) { |