fix(di): do not rely on the fact that types are canonicalized

vsavkin · vsavkin · commit 2147ce45c21a · 2015-07-16T15:19:18.000-07:00
diff --git a/modules/angular2/src/di/injector.ts b/modules/angular2/src/di/injector.ts
@@ -674,7 +674,7 @@ export class Injector {
 
   private _getByKey(key: Key, depVisibility: VisibilityMetadata, optional: boolean,
                     bindingVisibility: number): any {
-    if (key.token === Injector) {
+    if (key === INJECTOR_KEY) {
       return this;
     }
 
@@ -723,6 +723,8 @@ export class Injector {
   }
 }
 
+var INJECTOR_KEY = Key.get(Injector);
+
 
 function _resolveBindings(bindings: List<Type | Binding | List<any>>): List<ResolvedBinding> {
   var resolvedList = ListWrapper.createFixedSize(bindings.length);

Original file line number	Diff line number	Diff line change
`@@ -674,7 +674,7 @@ export class Injector {`
`674`	`674`
`675`	`675`	`private _getByKey(key: Key, depVisibility: VisibilityMetadata, optional: boolean,`
`676`	`676`	`bindingVisibility: number): any {`
`677`		`- if (key.token === Injector) {`
	`677`	`+ if (key === INJECTOR_KEY) {`
`678`	`678`	`return this;`
`679`	`679`	`}`
`680`	`680`
`@@ -723,6 +723,8 @@ export class Injector {`
`723`	`723`	`}`
`724`	`724`	`}`
`725`	`725`
	`726`	`+var INJECTOR_KEY = Key.get(Injector);`
	`727`	`+`
`726`	`728`
`727`	`729`	`function _resolveBindings(bindings: List<Type \| Binding \| List<any>>): List<ResolvedBinding> {`
`728`	`730`	`var resolvedList = ListWrapper.createFixedSize(bindings.length);`