[BUGFIX beta] Ensure Engines can boot without error. #4969
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 was referenced May 4, 2017
bmac
approved these changes
May 4, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The argument passed into
instance-initializersis either anEmber.ApplicationInstanceinstance or aEmber.EngineInstanceinstance. The.applicationproperty is only present onEmber.ApplicationInstance's.This change adds some inline comments around the various conditionals and swaps the logic to use
instance.basewhen present and avoid erroring if neither.baseor.applicationis present.A follow up PR will be made targeting
releasebranch (because this won't cherry-pick easily).Also, note, the second commit is not required but it does strip the deprecation related code in production builds which is kinda nice...
Addresses #4968