diff options
| author | JP Sugarbroad | 2012-06-13 13:37:19 -0700 |
|---|---|---|
| committer | Igor Minar | 2012-07-19 21:56:22 -0700 |
| commit | e3e8813e3c586093c79cffe2b17418c0c1797d4a (patch) | |
| tree | 2464ec78687f717adf9ac57e277cb4cd6e66d08e /src/auto/injector.js | |
| parent | 6e2d9711e8210f7fca216024fbe074eca302c98f (diff) | |
| download | angular.js-e3e8813e3c586093c79cffe2b17418c0c1797d4a.tar.bz2 | |
refactor($injector): move $injector into the providerCache
Better than special-casing '$injector' in createInjector.
Diffstat (limited to 'src/auto/injector.js')
| -rw-r--r-- | src/auto/injector.js | 11 |
1 files changed, 5 insertions, 6 deletions
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]); } |
