Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better resolver support for underscored templates. Eventually we'll 

migrate to dashed only.
This commit is contained in:
Robin Ward 2014-09-12 14:44:35 -04:00
parent 1de9c3b04a
commit 22fd7fb07d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/ember/resolver.js.es6
View File

@ -112,7 +112,13 @@ export default Ember.DefaultResolver.extend({
},
findTemplate: function(parsedName) {
return this._super(parsedName) || this.findSlashedTemplate(parsedName) || this.findAdminTemplate(parsedName);
return this._super(parsedName) || this.findSlashedTemplate(parsedName) || this.findAdminTemplate(parsedName) || this.findUnderscoredTemplate(parsedName);
},
findUnderscoredTemplate: function(parsedName) {
var decamelized = parsedName.fullNameWithoutType.decamelize();
var underscored = decamelized.replace("-", "_");
return Ember.TEMPLATES[underscored];
},
// Try to find a template with slash instead of first underscore, e.g. foo_bar_baz => foo/bar_baz

2
app/assets/javascripts/discourse/templates/header.js.handlebars
View File

@ -88,7 +88,7 @@
{{render "siteMap"}}
{{/if}}
{{render "userDropdown"}}
{{render "user-dropdown"}}
</div>