diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/auto/injector.js | 5 | ||||
| -rw-r--r-- | src/ng/animation.js | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/auto/injector.js b/src/auto/injector.js index b2795693..6b2865ef 100644 --- a/src/auto/injector.js +++ b/src/auto/injector.js @@ -597,7 +597,10 @@ function createInjector(modulesToLoad) { invoke: invoke, instantiate: instantiate, get: getService, - annotate: annotate + annotate: annotate, + has: function(name) { + return providerCache.hasOwnProperty(name + providerSuffix) || cache.hasOwnProperty(name); + } }; } } diff --git a/src/ng/animation.js b/src/ng/animation.js index 9a5a5a95..76cf943e 100644 --- a/src/ng/animation.js +++ b/src/ng/animation.js @@ -51,13 +51,9 @@ function $AnimationProvider($provide) { */ return function $animation(name) { if (name) { - try { - return $injector.get(camelCase(name) + suffix); - } catch (e) { - //TODO(misko): this is a hack! we should have a better way to test if the injector has a given key. - // The issue is that the animations are optional, and if not present they should be silently ignored. - // The proper way to fix this is to add API onto the injector so that we can ask to see if a given - // animation is supported. + var animationName = camelCase(name) + suffix; + if ($injector.has(animationName)) { + return $injector.get(animationName); } } } |
