From e3e8813e3c586093c79cffe2b17418c0c1797d4a Mon Sep 17 00:00:00 2001
From: JP Sugarbroad
Date: Wed, 13 Jun 2012 13:37:19 -0700
Subject: refactor($injector): move $injector into the providerCache
Better than special-casing '$injector' in createInjector.
---
src/auto/injector.js | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
(limited to 'src/auto')
diff --git a/src/auto/injector.js b/src/auto/injector.js
index e07c03a7..a7c39731 100644
--- a/src/auto/injector.js
+++ b/src/auto/injector.js
@@ -410,9 +410,10 @@ function createInjector(modulesToLoad) {
decorator: decorator
}
},
- providerInjector = createInternalInjector(providerCache, function() {
- throw Error("Unknown provider: " + path.join(' <- '));
- }),
+ providerInjector = (providerCache.$injector =
+ createInternalInjector(providerCache, function() {
+ throw Error("Unknown provider: " + path.join(' <- '));
+ })),
instanceCache = {},
instanceInjector = (instanceCache.$injector =
createInternalInjector(instanceCache, function(servicename) {
@@ -489,9 +490,7 @@ function createInjector(modulesToLoad) {
try {
for(var invokeQueue = moduleFn._invokeQueue, i = 0, ii = invokeQueue.length; i < ii; i++) {
var invokeArgs = invokeQueue[i],
- provider = invokeArgs[0] == '$injector'
- ? providerInjector
- : providerInjector.get(invokeArgs[0]);
+ provider = providerInjector.get(invokeArgs[0]);
provider[invokeArgs[1]].apply(provider, invokeArgs[2]);
}
--
cgit v1.2.3
f708300a8a9'>commitdiffstats|
|