Skip to content

Commit

Permalink
Merge pull request #4484 from bmac/api-docs-import-ds
Browse files Browse the repository at this point in the history
[BUGFIX beta] Update API docs to import DS from 'ember-data'
  • Loading branch information
bmac authored Jul 25, 2016
2 parents efa4d3a + 5d3c1b1 commit be53942
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions addon/-private/system/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -1127,9 +1127,9 @@ Store = Service.extend({
```javascript
// app/adapters/user.js
import Adapter from "ember-data/adapter";
import DS from "ember-data";
export default Adapter.extend({
export default DS.Adapter.extend({
queryRecord(modelName, query) {
return Ember.$.getJSON("/api/current_user");
}
Expand Down
6 changes: 3 additions & 3 deletions addon/serializers/json-api.js
Original file line number Diff line number Diff line change
Expand Up @@ -647,9 +647,9 @@ if (isEnabled("ds-payload-type-hooks")) {
`posr` model should be used:
```app/serializers/application.js
import JSONAPISerializer from "ember-data/serializers/json-api";
import DS from "ember-data";
export default JSONAPISerializer.extend({
export default DS.JSONAPISerializer.extend({
modelNameFromPayloadType(payloadType) {
return payloadType.replace('api::v1::', '');
}
Expand Down Expand Up @@ -695,7 +695,7 @@ if (isEnabled("ds-payload-type-hooks")) {
namespaces model name for the `post` should be used:
```app/serializers/application.js
import JSONAPISerializer from "ember-data/serializers/json-api";
import DS from "ember-data";
export default JSONAPISerializer.extend({
payloadTypeFromModelName(modelName) {
Expand Down
8 changes: 4 additions & 4 deletions addon/serializers/rest.js
Original file line number Diff line number Diff line change
Expand Up @@ -880,9 +880,9 @@ if (isEnabled("ds-payload-type-hooks")) {
`administrator` model should be used:
```app/serializers/application.js
import RESTSerializer from "ember-data/serializers/rest";
import DS from "ember-data";
export default RESTSerializer.extend({
export default DS.RESTSerializer.extend({
modelNameFromPayloadType(payloadType) {
return payloadType.replace('api::v1::', '');
}
Expand Down Expand Up @@ -930,9 +930,9 @@ if (isEnabled("ds-payload-type-hooks")) {
namespaces model name for the `administrator` should be used:
```app/serializers/application.js
import RESTSerializer from "ember-data/serializers/rest";
import DS from "ember-data";
export default RESTSerializer.extend({
export default DS.RESTSerializer.extend({
payloadTypeFromModelName(modelName) {
return "api::v1::" + modelName;
}
Expand Down

0 comments on commit be53942

Please sign in to comment.