Merge pull request #9569 from simi/little-deprecate-audit

Avoid if statements useful only for Ember.deprecate calls.
emberjs · Nov 13, 2014 · 54c51f2 · 54c51f2
2 parents 5ae9bba + 8d4df29
commit 54c51f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/packages/ember-application/lib/system/application.js b/packages/ember-application/lib/system/application.js
@@ -1036,9 +1036,7 @@ Application.reopenClass({
   @return {*} the resolved value for a given lookup
 */
 function resolverFor(namespace) {
-  if (namespace.get('resolver')) {
-    Ember.deprecate('Application.resolver is deprecated in favor of Application.Resolver', false);
-  }
+  Ember.deprecate('Application.resolver is deprecated in favor of Application.Resolver', !namespace.get('resolver'));
 
   var ResolverClass = namespace.get('resolver') || namespace.get('Resolver') || DefaultResolver;
   var resolver = ResolverClass.create({

diff --git a/packages/ember-views/lib/mixins/component_template_deprecation.js b/packages/ember-views/lib/mixins/component_template_deprecation.js
@@ -55,8 +55,6 @@ export default Mixin.create({
       delete props['template'];
     }
 
-    if (deprecatedProperty) {
-      Ember.deprecate('Do not specify ' + deprecatedProperty + ' on a Component, use ' + replacementProperty + ' instead.', false);
-    }
+    Ember.deprecate('Do not specify ' + deprecatedProperty + ' on a Component, use ' + replacementProperty + ' instead.', !deprecatedProperty);
   }
 });