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

fix order of plugin template resolution
2026-08-10 04:58:31 -05:00 · 2016-09-02 14:26:02 -04:00
parent d2e1fccc90 422941a606
commit 574a4d7758
1 changed files with 2 additions and 2 deletions
@@ -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;