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 release] Ensure Engines can boot without error. #4970

Merged
merged 1 commit into from
May 4, 2017

Conversation

rwjblue
Copy link
Member

@rwjblue rwjblue commented May 4, 2017

The argument passed into instance-initializers is either an Ember.ApplicationInstance instance or a Ember.EngineInstance instance. The .application property is only present on Ember.ApplicationInstance's.

This change adds some inline comments around the various conditionals and swaps the logic to use instance.base when present and avoid erroring if neither .base or .application is present.


This mirrors the functionality changes made in #4969, but targets release branch.

Closes #4968

The argument passed into `instance-initializers` is _either_ an
`Ember.ApplicationInstance` instance _or_ a `Ember.EngineInstance`
instance. The `.application` property is only present on
`Ember.ApplicationInstance`'s.

This change adds some inline comments around the various conditionals
and swaps the logic to use `instance.base` when present and avoid
erroring if neither `.base` or `.application` is present.
Copy link
Member

@bmac bmac left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@bmac
Copy link
Member

bmac commented May 4, 2017

Travis was red but the only failure was from an unrelated thats already fixed on master. I'm going to merge this and cherry-pick the build fix from master to the release branch.

@bmac bmac merged commit 45edaf4 into emberjs:release May 4, 2017
@rwjblue rwjblue deleted the enable-engines-with-2-13 branch May 4, 2017 14:54
@rwjblue
Copy link
Member Author

rwjblue commented May 4, 2017

👍 Thank you!

jghansell added a commit to swarmbox/data that referenced this pull request Aug 29, 2023
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.

2 participants