Skip to content

Commit

Permalink
Update data-adapter-mixin.js
Browse files Browse the repository at this point in the history
Fix incorrect docs about headersForRequest being used for ember-data versions >= 2.7.
This is on hold until emberjs/rfcs#171 gets resolved
  • Loading branch information
Julien Palmas authored and marcoow committed Jun 7, 2017
1 parent 4472ac7 commit 1f453b7
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions addon/mixins/data-adapter-mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,9 @@ export default Mixin.create({
specific header name and contents depend on the actual authorizer that is
used.
This method applies for Ember Data 2.6 and older. See `headersForRequest`
for newer versions of Ember Data.
Until [emberjs/rfcs#171](https://github.com/emberjs/rfcs/pull/171)
gets resolved, this method will be called for **every** ember-data version.
`headersForRequest` *should* replace it after the resolution of the RFC.
@method ajaxOptions
@protected
Expand All @@ -92,8 +93,9 @@ export default Mixin.create({
Adds request headers containing the authorization data as constructed
by the {{#crossLink "DataAdapterMixin/authorizer:property"}}{{/crossLink}}.
This method will only be called in Ember Data 2.7 or greater. Older versions
will rely on `ajaxOptions` for request header injection.
Until [emberjs/rfcs#171](https://github.com/emberjs/rfcs/pull/171)
gets resolved, this method will **not** be used.
See `ajaxOptions` instead.
@method headersForRequest
@protected
Expand Down

0 comments on commit 1f453b7

Please sign in to comment.