Merge pull request #11837 from EricSchank/master

[DOC beta] Refs issue #11835
emberjs · Jul 21, 2015 · d0c771c · d0c771c
2 parents a83f914 + 1f02a38
commit d0c771c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/packages/ember-application/lib/system/application.js b/packages/ember-application/lib/system/application.js
@@ -552,7 +552,11 @@ var Application = Namespace.extend({
     @method initialize
    **/
   initialize() {
-    Ember.deprecate('Calling initialize manually is not supported. Please see Ember.Application#advanceReadiness and Ember.Application#deferReadiness');
+    Ember.deprecate(
+      'Calling initialize manually is not supported. Please see Ember.Application#advanceReadiness and Ember.Application#deferReadiness',
+      false,
+      { id: 'ember-application.initialize', until: '3.0.0' }
+    );
   },
 
   /**
@@ -1081,7 +1085,11 @@ Application.reopenClass({
   @return {*} the resolved value for a given lookup
 */
 function resolverFor(namespace) {
-  Ember.deprecate('Application.resolver is deprecated in favor of Application.Resolver', !namespace.get('resolver'));
+  Ember.deprecate(
+    'Application.resolver is deprecated in favor of Application.Resolver',
+    !namespace.get('resolver'),
+    { id: 'ember-application.resolverFor', until: '3.0.0' }
+  );
 
   var ResolverClass = namespace.get('resolver') || namespace.get('Resolver') || DefaultResolver;
   var resolver = ResolverClass.create({
@@ -1104,7 +1112,11 @@ function resolverFor(namespace) {
     if (resolver.normalize) {
       return resolver.normalize(fullName);
     } else {
-      Ember.deprecate('The Resolver should now provide a \'normalize\' function', false);
+      Ember.deprecate(
+        'The Resolver should now provide a \'normalize\' function',
+        false,
+        { id: 'ember-application.resolve-normalize', until: '3.0.0' }
+      );
       return fullName;
     }
   };

diff --git a/packages/ember-application/lib/utils/validate-type.js b/packages/ember-application/lib/utils/validate-type.js
@@ -27,7 +27,8 @@ export default function validateType(resolvedType, parsedName) {
       `property set to true. You registered ${resolvedType} as a ${parsedName.type} ` +
       `factory. Either add the \`${factoryFlag}\` property to this factory or ` +
       `extend from ${expectedType}.`,
-      resolvedType[factoryFlag]
+      resolvedType[factoryFlag],
+      { id: 'ember-application.validate-type', until: '3.0.0' }
     );
   } else {
     Ember.assert(

diff --git a/packages/ember/lib/main.js b/packages/ember/lib/main.js
@@ -30,4 +30,7 @@ runLoadHooks('Ember');
 @module ember
 */
 
-Ember.deprecate('Usage of Ember is deprecated for Internet Explorer 6 and 7, support will be removed in the next major version.', !environment.userAgent.match(/MSIE [67]/));
+Ember.deprecate(
+  'Usage of Ember is deprecated for Internet Explorer 6 and 7, support will be removed in the next major version.',
+  !environment.userAgent.match(/MSIE [67]/),
+  { id: 'ember.ie6-ie7', until: '3.0.0' });