Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-05-16 02:33:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Misko Hevery 2012-09-11 22:10:26 -07:00
parent 209b67df6a
commit b0a05a7531
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ng/route.js
View file

@ -373,7 +373,7 @@ function $RouteProvider(){
forEach(next.resolve || {}, function(value, key) { forEach(next.resolve || {}, function(value, key) {
keys.push(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)) { if (isDefined(template = next.template)) {
} else if (isDefined(template = next.templateUrl)) { } else if (isDefined(template = next.templateUrl)) {

4
test/ng/routeSpec.js
View file

@ -232,10 +232,10 @@ describe('$route', function() {
return deferB.promise; return deferB.promise;
}); });
$routeProvider.when('/path', { templateUrl: 'foo.html', resolve: { $routeProvider.when('/path', { templateUrl: 'foo.html', resolve: {
a: function($q) { a: ['$q', function($q) {
deferA = $q.defer(); deferA = $q.defer();
return deferA.promise; return deferA.promise;
}, }],
b: 'b' b: 'b'
} }); } });
}); });