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

FIX: Mobile raw templates weren't being resolved

This commit is contained in:
Robin Ward 2016-10-26 11:19:29 -04:00
parent b601120b39
commit fa3c45bb4c
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/discourse-common/resolver.js.es6
View File

@ -132,12 +132,6 @@ export function buildResolver(baseName) {
}, },
resolveTemplate(parsedName) { resolveTemplate(parsedName) {
let fullName = parsedName.fullNameWithoutType;
if (fullName.indexOf('.raw') !== -1) {
return Ember.TEMPLATES[fullName] ||
Ember.TEMPLATES[fullName.replace(/\.raw$/, '')];
}
return this.findPluginMobileTemplate(parsedName) || return this.findPluginMobileTemplate(parsedName) ||
this.findPluginTemplate(parsedName) || this.findPluginTemplate(parsedName) ||
this.findMobileTemplate(parsedName) || this.findMobileTemplate(parsedName) ||
@ -187,6 +181,7 @@ export function buildResolver(baseName) {
return this._super(parsedName) || return this._super(parsedName) ||
templates[slashedType] || templates[slashedType] ||
templates[withoutType] || templates[withoutType] ||
templates[withoutType.replace(/\.raw$/, '')] ||
templates[dashed] || templates[dashed] ||
templates[decamelized.replace(/\./, '/')] || templates[decamelized.replace(/\./, '/')] ||
templates[decamelized.replace(/\_/, '/')] || templates[decamelized.replace(/\_/, '/')] ||