fix order of plugin template resolution

2016-09-02 12:55:11 -04:00 · 2016-09-02 12:55:11 -04:00 · 422941a606
parent d2e1fccc90
commit 422941a606
1 changed files with 2 additions and 2 deletions
--- a/app/assets/javascripts/discourse/ember/resolver.js.es6
+++ b/app/assets/javascripts/discourse/ember/resolver.js.es6
@ -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;