Skip to content

Fix component template lookup with pods. #53

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
stefanpenner merged 1 commit into from
Jun 15, 2014
Merged

Fix component template lookup with pods. #53

Show file tree
Hide file tree
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: 1 addition & 1 deletion dist/ember-resolver-spade.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ember-resolver-tests.js
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions dist/ember-resolver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// ==========================================================================


// Version: 0.1.1
// Version: 0.1.2

(function() {
/*globals define registry requirejs */
Expand Down Expand Up @@ -152,8 +152,13 @@ define("ember/resolver",

podBasedModuleName: function(parsedName) {
var podPrefix = this.namespace.podModulePrefix || this.namespace.modulePrefix;
var fullNameWithoutType = parsedName.fullNameWithoutType;

return podPrefix + '/' + parsedName.fullNameWithoutType + '/' + parsedName.type;
if (parsedName.type === 'template') {
fullNameWithoutType = fullNameWithoutType.replace(/^components\//, '');
}

return podPrefix + '/' + fullNameWithoutType + '/' + parsedName.type;
},

mainModuleName: function(parsedName) {
Expand Down
4 changes: 2 additions & 2 deletions dist/ember-resolver.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions dist/ember-resolver.prod.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// ==========================================================================


// Version: 0.1.1
// Version: 0.1.2

(function() {
/*globals define registry requirejs */
Expand Down Expand Up @@ -152,8 +152,13 @@ define("ember/resolver",

podBasedModuleName: function(parsedName) {
var podPrefix = this.namespace.podModulePrefix || this.namespace.modulePrefix;
var fullNameWithoutType = parsedName.fullNameWithoutType;

return podPrefix + '/' + parsedName.fullNameWithoutType + '/' + parsedName.type;
if (parsedName.type === 'template') {
fullNameWithoutType = fullNameWithoutType.replace(/^components\//, '');
}

return podPrefix + '/' + fullNameWithoutType + '/' + parsedName.type;
},

mainModuleName: function(parsedName) {
Expand Down
15 changes: 15 additions & 0 deletions dist/modules/ember-resolver-tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,5 +361,20 @@ test("will not use custom type prefix when using POD format", function() {

resolver.resolve('controller:foo');
});

test("will lookup a components template without being rooted in `components/`", function() {
define('appkit/components/foo-bar/template', [], function(){
ok(false, 'appkit/components was used');
return 'whatever';
});

define('appkit/foo-bar/template', [], function(){
ok(true, 'appkit/foo-bar/template was used');
return 'whatever';
});

resolver.resolve('template:components/foo-bar');
});

})();

7 changes: 6 additions & 1 deletion dist/modules/ember-resolver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,13 @@ define("ember/resolver",

podBasedModuleName: function(parsedName) {
var podPrefix = this.namespace.podModulePrefix || this.namespace.modulePrefix;
var fullNameWithoutType = parsedName.fullNameWithoutType;

return podPrefix + '/' + parsedName.fullNameWithoutType + '/' + parsedName.type;
if (parsedName.type === 'template') {
fullNameWithoutType = fullNameWithoutType.replace(/^components\//, '');
}

return podPrefix + '/' + fullNameWithoutType + '/' + parsedName.type;
},

mainModuleName: function(parsedName) {
Expand Down
7 changes: 6 additions & 1 deletion packages/ember-resolver/lib/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,13 @@ define("ember/resolver",

podBasedModuleName: function(parsedName) {
var podPrefix = this.namespace.podModulePrefix || this.namespace.modulePrefix;
var fullNameWithoutType = parsedName.fullNameWithoutType;

return podPrefix + '/' + parsedName.fullNameWithoutType + '/' + parsedName.type;
if (parsedName.type === 'template') {
fullNameWithoutType = fullNameWithoutType.replace(/^components\//, '');
}

return podPrefix + '/' + fullNameWithoutType + '/' + parsedName.type;
},

mainModuleName: function(parsedName) {
Expand Down
16 changes: 15 additions & 1 deletion packages/ember-resolver/tests/core_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,4 +298,18 @@ test("will not use custom type prefix when using POD format", function() {
});

resolver.resolve('controller:foo');
});
});

test("will lookup a components template without being rooted in `components/`", function() {
define('appkit/components/foo-bar/template', [], function(){
ok(false, 'appkit/components was used');
return 'whatever';
});

define('appkit/foo-bar/template', [], function(){
ok(true, 'appkit/foo-bar/template was used');
return 'whatever';
});

resolver.resolve('template:components/foo-bar');
});