From 18da378f9a9a6e5f3470f9798fd3c4898c9e51b7 Mon Sep 17 00:00:00 2001
From: Angus McLeod <angus@mcleod.org.au>
Date: Wed, 31 Aug 2016 10:23:56 -0400
Subject: [PATCH] only perform the check on mobile view

---
 app/assets/javascripts/discourse/ember/resolver.js.es6 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/ember/resolver.js.es6 b/app/assets/javascripts/discourse/ember/resolver.js.es6
index 98f05c8df5b..cdad09f8bd9 100644
--- a/app/assets/javascripts/discourse/ember/resolver.js.es6
+++ b/app/assets/javascripts/discourse/ember/resolver.js.es6
@@ -141,8 +141,10 @@ export default Ember.DefaultResolver.extend({
   },
 
   findPluginMobileTemplate(parsedName) {
-    var pluginParsedName = this.parseName(parsedName.fullName.replace("template:", "template:javascripts/mobile/"));
-    return this.findTemplate(pluginParsedName);
+    if (this.mobileView) {
+      var pluginParsedName = this.parseName(parsedName.fullName.replace("template:", "template:javascripts/mobile/"));
+      return this.findTemplate(pluginParsedName);
+    }
   },
 
   findMobileTemplate(parsedName) {