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

Backport Fix usage of registry for 2.1.0+ from pr #3665 #3840

Merged
merged 3 commits into from
Oct 16, 2015

Conversation

bmac
Copy link
Member

@bmac bmac commented Oct 12, 2015

No description provided.

bmac and others added 3 commits October 7, 2015 10:08
[BUGFIX] Restore IE8 compatibility by using Ember.create
Using `registry.resolve` is generally private API, and `container.lookupFactory`
provides roughly the same result.

We still need the registry to actually register the model we create, so
I added a small matrix inline (this was the only usage of accessing the
registry off of `this.container` that I found in the codebase).

(cherry picked from commit 64ccbc3)
This was previously passing, because Ember 2.0.0 and lower did not
properly rethrow the error in all circumstances.

(cherry picked from commit b6498c4)
// container._registry = 1.11 - 2.0
// container = < 1.11
var registry = this.container.registry || this.container._registry || this.container;
var mixin = this.container.lookupFactory('mixin:' + normalizedModelName);
Copy link
Member Author

Choose a reason for hiding this comment

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

Need to double check that container.lookupFactory has existed since 1.8 before this can be merged.

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

yes. Thanks @sly7-7

@fivetanley
Copy link
Member

👍

@bmac bmac force-pushed the release-1-13 branch 3 times, most recently from daa8774 to 0f3c4d1 Compare October 16, 2015 08:54
bmac added a commit that referenced this pull request Oct 16, 2015
Backport Fix usage of registry for 2.1.0+ from pr #3665
@bmac bmac merged commit b3060e6 into emberjs:release-1-13 Oct 16, 2015
@bmac bmac deleted the backport-3665 branch October 16, 2015 12:05
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.

None yet

4 participants