Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BUGFIX beta] The adapter should call ajax instead of the new metho… #4448

Merged
merged 1 commit into from
Jun 28, 2016

Conversation

bmac
Copy link
Member

@bmac bmac commented Jun 24, 2016

…ds if it has been customized.

cc @pangratz @rwjblue

@pangratz pangratz self-assigned this Jun 24, 2016
@@ -99,7 +100,7 @@ var JSONAPIAdapter = RESTAdapter.extend({
@return {Promise} promise
*/
findMany(store, type, ids, snapshots) {
if (isEnabled('ds-improved-ajax')) {
if (isEnabled('ds-improved-ajax') && !this._hasCustomizedAjax()) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This only works if we support ember-cli/babel-plugin-feature-flags#4. Are the necessary dependencies in ember-data updated so this is satisfied? I'm just asking; haven't had time to follow recent developments in ember-data too closely...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be allowed, as that was released as 0.2.1 and we are depending on ^0.2.0 (see here).

Copy link
Member

@pangratz pangratz Jun 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, awesome. Sorry for making you check this, I realize I could have easily done this myself 😔

@pangratz
Copy link
Member

Apart from a few comments, this looks great! Thanks @bmac for tackling this!

@pangratz pangratz removed their assignment Jun 25, 2016
@bmac bmac merged commit e030fa6 into emberjs:master Jun 28, 2016
@bmac bmac deleted the improved-ajax-fallback branch June 28, 2016 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants