Skip to content

Commit

Permalink
Merge pull request #3410 from Dhaulagiri/br-typo-fix
Browse files Browse the repository at this point in the history
Fix minor typo in deprecation warning
  • Loading branch information
wecc committed Jun 22, 2015
2 parents 7c237a6 + 41b0f9a commit b8e4cd5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions packages/ember-data/lib/system/adapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ var Adapter = Ember.Object.extend({
*/
shouldReloadAll: function(store, snapshotRecordArray) {
var modelName = snapshotRecordArray.type.modelName;
Ember.deprecate(`The default behavior of shouldReloadAll will change in Ember Data 2.0 to always return false when there is at least one "${modelName}" record in the store. If you would like to preserve the current behavior please override shouldReloadAll in you adapter:application and return true.`);
Ember.deprecate(`The default behavior of shouldReloadAll will change in Ember Data 2.0 to always return false when there is at least one "${modelName}" record in the store. If you would like to preserve the current behavior please override shouldReloadAll in your adapter:application and return true.`);
return true;
},

Expand All @@ -504,7 +504,7 @@ var Adapter = Ember.Object.extend({
@return {Boolean}
*/
shouldBackgroundReloadRecord: function(store, snapshot) {
Ember.deprecate('The default behavior of `shouldBackgroundReloadRecord` will change in Ember Data 2.0 to always return true. If you would like to preserve the current behavior please override `shouldBackgroundReloadRecord` in you adapter:application and return false.');
Ember.deprecate('The default behavior of `shouldBackgroundReloadRecord` will change in Ember Data 2.0 to always return true. If you would like to preserve the current behavior please override `shouldBackgroundReloadRecord` in your adapter:application and return false.');
return false;
},

Expand Down
2 changes: 1 addition & 1 deletion packages/ember-data/tests/integration/adapter/find-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ test("store.findAll should trigger a deprecation warning about store.shouldReloa
run(function() {
expectDeprecation(function() {
store.findAll('person');
}, 'The default behavior of shouldReloadAll will change in Ember Data 2.0 to always return false when there is at least one "person" record in the store. If you would like to preserve the current behavior please override shouldReloadAll in you adapter:application and return true.');
}, 'The default behavior of shouldReloadAll will change in Ember Data 2.0 to always return false when there is at least one "person" record in the store. If you would like to preserve the current behavior please override shouldReloadAll in your adapter:application and return true.');
});
});

Expand Down

0 comments on commit b8e4cd5

Please sign in to comment.