Merge pull request #3362 from wecc/new-serializer-api-deprecation

Improve deprecation for not using the new Serializer API
emberjs · Jun 16, 2015 · 900d378 · 900d378
2 parents 5ccad07 + e2f9d1f
commit 900d378
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/packages/ember-data/lib/initializers/store.js b/packages/ember-data/lib/initializers/store.js
@@ -34,8 +34,8 @@ export default function initializeStore(registry, application) {
   ]);
 
   // new go forward paths
-  registry.register('serializer:-default', JSONSerializer);
-  registry.register('serializer:-rest', RESTSerializer);
+  registry.register('serializer:-default', JSONSerializer.extend({ isNewSerializerAPI: true }));
+  registry.register('serializer:-rest', RESTSerializer.extend({ isNewSerializerAPI: true }));
   registry.register('adapter:-rest', RESTAdapter);
 
   registry.register('adapter:-json-api', JSONAPIAdapter);

diff --git a/packages/ember-data/lib/system/store/container-instance-cache.js b/packages/ember-data/lib/system/store/container-instance-cache.js
@@ -46,9 +46,6 @@ Ember.merge(ContainerInstanceCache.prototype, {
       let instance = this.instanceFor(lookupKey);
 
       if (instance) {
-        if (fallback === '-default') {
-          instance.set('isNewSerializerAPI', true);
-        }
         return instance;
       }
     }