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.

Sign up for GitHub

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

Jump to bottom

[BUGFIX release] Transition to loaded.saved state after rollback #3555

Merged
merged 2 commits into from
Jul 20, 2015
Merged

[BUGFIX release] Transition to loaded.saved state after rollback #3555

merged 2 commits into from
Jul 20, 2015

Conversation

tchak
Copy link
Member

@tchak tchak commented Jul 17, 2015

Closes #3499 #3498

@bmac
Copy link
Member

bmac commented Jul 17, 2015

Looks good to me.

@tchak
Copy link
Member Author

tchak commented Jul 17, 2015

In case of #3498 I have added tests that prouves my interpretation of the issue. The behavior is intended.

@tchak tchak force-pushed the rollback-from-invalid branch from ec9bd8f to 50c63eb Compare July 17, 2015 14:08
@tchak
Copy link
Member Author

tchak commented Jul 17, 2015

Oops. Fixed.

@tchak
Copy link
Member Author

tchak commented Jul 18, 2015

There is probably more to the #3498 then I thought. Working on it.

@tchak tchak force-pushed the rollback-from-invalid branch 2 times, most recently from 430019a to 20b3d62 Compare July 18, 2015 08:46
@tchak
Copy link
Member Author

tchak commented Jul 18, 2015

@bmac @fivetanley updated with new fixe for #3498

@tchak
Copy link
Member Author

tchak commented Jul 18, 2015

@stefanpenner I replaced usage of Ember.Enumerable with Ember.ArrayProxy for now. I am not sure what is the future of Ember.ArrayProxy but it is used extensively in ember-data so I think it is fine for now and I don't want to bother reimplement it in terms of Ember.Array.

@stefanpenner
Copy link
Member

@stefanpenner I replaced usage of Ember.Enumerable with Ember.ArrayProxy for now. I am not sure what is the future of Ember.ArrayProxy but it is used extensively in ember-data so I think it is fine for now and I don't want to bother reimplement it in terms of Ember.Array.

its staying around for 2.x, after that lets see.

@tchak tchak force-pushed the rollback-from-invalid branch from 20b3d62 to 15899a0 Compare July 18, 2015 16:35
@tchak tchak force-pushed the rollback-from-invalid branch from 15899a0 to ec5d73e Compare July 19, 2015 10:24
bmac added a commit that referenced this pull request Jul 20, 2015
@bmac
Merge pull request #3555 from tchak/rollback-from-invalid
2d40783 
[BUGFIX release] Transition to loaded.saved state after rollback
@bmac bmac merged commit 2d40783 into emberjs:master Jul 20, 2015
@offirgolan offirgolan mentioned this pull request Aug 27, 2015
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@tchak @bmac @stefanpenner