honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(di): minor cleanup

This commit is contained in:
vsavkin 2015-10-27 17:59:07 -07:00
parent 6514b8ced0
commit f9963d3d21
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/angular2/src/core/di/provider.ts
View File

@ -643,9 +643,7 @@ function _extractToken(typeOrFunc, metadata /*any[] | any*/, params: any[][]): D
if (!isArray(metadata)) {
if (metadata instanceof InjectMetadata) {
var metaArrayWrapper = ListWrapper.createFixedSize(1);
metaArrayWrapper[0] = metadata;
metadata = metaArrayWrapper;
return _createDependency(metadata.token, optional, null, null, depProps);
} else {
return _createDependency(metadata, optional, null, null, depProps);
}

16
modules/angular2/test/core/di/injector_spec.ts
View File

@ -646,15 +646,15 @@ export function main() {
expect(provider.resolvedFactories[0].dependencies[0].properties)
.toEqual([new CustomDependencyMetadata()]);
});
});
it('should allow declaring dependencies with flat arrays', () => {
var resolved =
Injector.resolve([bind('token').toFactory(e => e, [new InjectMetadata("dep")])]);
var nestedResolved =
Injector.resolve([bind('token').toFactory(e => e, [[new InjectMetadata("dep")]])]);
expect(resolved[0].resolvedFactories[0].dependencies[0].key.token)
.toEqual(nestedResolved[0].resolvedFactories[0].dependencies[0].key.token);
it('should allow declaring dependencies with flat arrays', () => {
var resolved = Injector.resolve(
[provide('token', {useFactory: e => e, deps: [new InjectMetadata("dep")]})]);
var nestedResolved = Injector.resolve(
[provide('token', {useFactory: e => e, deps: [[new InjectMetadata("dep")]]})]);
expect(resolved[0].resolvedFactories[0].dependencies[0].key.token)
.toEqual(nestedResolved[0].resolvedFactories[0].dependencies[0].key.token);
});
});
describe("displayName", () => {