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

switch back to inheriting from Ember.DefaultResolver #32

Merged
merged 1 commit into from
Mar 6, 2014

Conversation

ghempton
Copy link
Contributor

@ghempton ghempton commented Mar 6, 2014

Although I think it would be great to have a pristine module-only resolver, we are still tied to real world use cases that Ember.DefaultResolver solves– namely, Ember.TEMPLATES. Libraries such as ember-easyForm and the emblem.js compiler in EAK still use Ember.TEMPLATES.

@stefanpenner
Copy link
Contributor

(cc @teddyzeenny)

Ember.Resolver = Ember.DefaultResolver;
}
if (typeof requirejs.entries === 'undefined') {
requirejs.entries = requirejs._eak_seen;
Copy link
Contributor

Choose a reason for hiding this comment

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

why was this removed?

Copy link
Member

Choose a reason for hiding this comment

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

It seems that the _eak_seen check is still needed for sure.

@ghempton
Copy link
Contributor Author

ghempton commented Mar 6, 2014

Just re-added the _eak_seen check (was removed by accident).

@ghempton
Copy link
Contributor Author

ghempton commented Mar 6, 2014

@teddyzeenny ok... I just changed the gem dependency back to beta4 since it was already decided. Is definitely confusing to clone a repo and have non-existent dependencies though.

@stefanpenner
Copy link
Contributor

@ghempton confusing agreed, but it will be sorted out by monday.

teddyzeenny added a commit that referenced this pull request Mar 6, 2014
switch back to inheriting from Ember.DefaultResolver
@teddyzeenny teddyzeenny merged commit 618dca2 into ember-cli:master Mar 6, 2014
@teddyzeenny
Copy link
Contributor

👍 @ghempton. Sorry about the gem version confusion.

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.

4 participants