From 22fd7fb07de7091a182d23c0c7bf1fa9dc592150 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 12 Sep 2014 14:44:35 -0400
Subject: [PATCH] Better resolver support for underscored templates. Eventually
 we'll migrate to dashed only.

---
 app/assets/javascripts/discourse/ember/resolver.js.es6    | 8 +++++++-
 .../javascripts/discourse/templates/header.js.handlebars  | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/ember/resolver.js.es6 b/app/assets/javascripts/discourse/ember/resolver.js.es6
index d52c9f769dd..e8c6a2af344 100644
--- a/app/assets/javascripts/discourse/ember/resolver.js.es6
+++ b/app/assets/javascripts/discourse/ember/resolver.js.es6
@@ -112,7 +112,13 @@ export default Ember.DefaultResolver.extend({
   },
 
   findTemplate: function(parsedName) {
-    return this._super(parsedName) || this.findSlashedTemplate(parsedName) || this.findAdminTemplate(parsedName);
+    return this._super(parsedName) || this.findSlashedTemplate(parsedName) || this.findAdminTemplate(parsedName) || this.findUnderscoredTemplate(parsedName);
+  },
+
+  findUnderscoredTemplate: function(parsedName) {
+    var decamelized = parsedName.fullNameWithoutType.decamelize();
+    var underscored = decamelized.replace("-", "_");
+    return Ember.TEMPLATES[underscored];
   },
 
   // Try to find a template with slash instead of first underscore, e.g. foo_bar_baz => foo/bar_baz
diff --git a/app/assets/javascripts/discourse/templates/header.js.handlebars b/app/assets/javascripts/discourse/templates/header.js.handlebars
index a38ced890f4..40ad5ee8b57 100644
--- a/app/assets/javascripts/discourse/templates/header.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/header.js.handlebars
@@ -88,7 +88,7 @@
         {{render "siteMap"}}
       {{/if}}
 
-      {{render "userDropdown"}}
+      {{render "user-dropdown"}}
 
     </div>