Skip to content

Igor/rollback delete #2

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

Merged
nhan merged 1 commit into from
Jun 17, 2013
Merged

Igor/rollback delete #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/ember-data/lib/system/model/states.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,6 +761,8 @@ var states = {
store.dematerializeRecord(record);
},

rollback: Ember.K,
Copy link

@tonysherbondy tonysherbondy Jun 14, 2013

Choose a reason for hiding this comment

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

4 commits end with one line change?

Copy link
Author

@igorT igorT Jun 14, 2013

Choose a reason for hiding this comment

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

No idea, seems like rebase/git weirdness

Copy link

@tonysherbondy tonysherbondy Jun 15, 2013

Choose a reason for hiding this comment

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

So, are there more changes we should look at then just this line? If so, is there a way you can create a diff that shows that?

Copy link
Author

@igorT igorT Jun 15, 2013

Choose a reason for hiding this comment

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

No, thats the only line I changed.


invokeLifecycleCallbacks: function(manager) {
var record = get(manager, 'record');
record.trigger('didDelete', record);
Expand Down