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

Merge pull request #4434 from angusmcleod/template-resolution-order 

fix order of plugin template resolution
This commit is contained in:
Robin Ward 2016-09-02 14:26:02 -04:00 committed by GitHub
parent d2e1fccc90 422941a606
commit 574a4d7758
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,8 +115,8 @@ export default Ember.DefaultResolver.extend({
},
resolveTemplate(parsedName) {
return this.findPluginTemplate(parsedName) ||
this.findPluginMobileTemplate(parsedName) ||
return this.findPluginMobileTemplate(parsedName) ||
this.findPluginTemplate(parsedName) ||
this.findMobileTemplate(parsedName) ||
this.findTemplate(parsedName) ||
Ember.TEMPLATES.not_found;