Skip to content

Commit b2ba3c5

Browse files
authored
Merge pull request #206 from broerse/pluralize
Resolve Ember.String.pluralize() deprecation
2 parents 2a61dd1 + dee632e commit b2ba3c5

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

addon/adapters/pouch.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Ember from 'ember';
22
import DS from 'ember-data';
3+
import { pluralize } from 'ember-inflector';
34
//import BelongsToRelationship from 'ember-data/-private/system/relationships/state/belongs-to';
45

56
import {
@@ -13,7 +14,6 @@ const {
1314
},
1415
on,
1516
String: {
16-
pluralize,
1717
camelize,
1818
classify
1919
}
@@ -96,7 +96,7 @@ export default DS.RESTAdapter.extend({
9696
}
9797
return;
9898
}
99-
99+
100100
try {
101101
store.modelFor(obj.type);
102102
} catch (e) {
@@ -400,7 +400,7 @@ export default DS.RESTAdapter.extend({
400400
var recordTypeName = this.getRecordTypeName(type);
401401
return this._findRecord(recordTypeName, id);
402402
},
403-
403+
404404
_findRecord(recordTypeName, id) {
405405
return this.get('db').rel.find(recordTypeName, id).then(payload => {
406406
// Ember Data chokes on empty payload, this function throws
@@ -414,18 +414,18 @@ export default DS.RESTAdapter.extend({
414414
return payload;
415415
}
416416
}
417-
417+
418418
return this._eventuallyConsistent(recordTypeName, id);
419419
});
420420
},
421-
421+
422422
//TODO: cleanup promises on destroy or db change?
423423
waitingForConsistency: {},
424424
_eventuallyConsistent: function(type, id) {
425425
let pouchID = this.get('db').rel.makeDocID({type, id});
426426
let defer = Ember.RSVP.defer();
427427
this.waitingForConsistency[pouchID] = defer;
428-
428+
429429
return this.get('db').rel.isDeleted(type, id).then(deleted => {
430430
//TODO: should we test the status of the promise here? Could it be handled in onChange already?
431431
if (deleted) {

0 commit comments

Comments
 (0)