diff options
| author | Misko Hevery | 2012-09-11 22:10:26 -0700 |
|---|---|---|
| committer | Misko Hevery | 2012-09-11 22:10:26 -0700 |
| commit | b0a05a7531ed7235aa6d2c4e3ea11373e1fc73f1 (patch) | |
| tree | e1c284815727101c17e1374c2be24faeb9a8b1d2 /src | |
| parent | 209b67df6a49fe1646ce63c5e7d11ed26e8abbc1 (diff) | |
| download | angular.js-b0a05a7531ed7235aa6d2c4e3ea11373e1fc73f1.tar.bz2 | |
fix($route): support inline annotation on .resolve
Diffstat (limited to 'src')
| -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)) { |