diff options
| author | Misko Hevery | 2011-08-02 13:29:12 -0700 |
|---|---|---|
| committer | Igor Minar | 2011-10-11 10:53:04 -0700 |
| commit | 25a62b58db31c212c330d1bd7ce58bdd031e114a (patch) | |
| tree | 9a332f36491740dabeabda1c8fa3062c62076ce8 /src/Injector.js | |
| parent | 97e3ec4d1b58a253d61c15239002265b33c30a13 (diff) | |
| download | angular.js-25a62b58db31c212c330d1bd7ce58bdd031e114a.tar.bz2 | |
refactor(injection) infer injection args in ng:controller only
Because only controllers don't have currying, we can infer its arguments, all other APIs needing currying, automatic inference complicates the matters unecessary.
Diffstat (limited to 'src/Injector.js')
| -rw-r--r-- | src/Injector.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Injector.js b/src/Injector.js index 912e911c..0e0fddf6 100644 --- a/src/Injector.js +++ b/src/Injector.js @@ -60,6 +60,7 @@ function createInjector(factoryScope, factories, instanceCache) { if (!(value in instanceCache)) { var factory = factories[value]; if (!factory) throw Error("Unknown provider for '"+value+"'."); + inferInjectionArgs(factory); instanceCache[value] = invoke(factoryScope, factory); } return instanceCache[value]; @@ -67,7 +68,7 @@ function createInjector(factoryScope, factories, instanceCache) { function invoke(self, fn, args){ args = args || []; - var injectNames = injectionArgs(fn); + var injectNames = fn.$inject || []; var i = injectNames.length; while(i--) { args.unshift(injector(injectNames[i])); @@ -133,7 +134,7 @@ var FN_ARGS = /^function\s*[^\(]*\(([^\)]*)\)/m; var FN_ARG_SPLIT = /,/; var FN_ARG = /^\s*(.+?)\s*$/; var STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg; -function injectionArgs(fn) { +function inferInjectionArgs(fn) { assertArgFn(fn); if (!fn.$inject) { var args = fn.$inject = []; |
