From 4e45c5ff3d4b1cc074950710996d31a10c45b46f Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Fri, 22 Nov 2013 11:50:57 -0500
Subject: [PATCH] Fix js for handling click of header buttons. They were adding
 /# to the url, which broke routing.

---
 .../discourse/templates/header.js.handlebars  | 83 ++++++++++---------
 .../discourse/views/header_view.js            |  3 +-
 2 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/header.js.handlebars b/app/assets/javascripts/discourse/templates/header.js.handlebars
index ed85a469cd0..a41630353a6 100644
--- a/app/assets/javascripts/discourse/templates/header.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/header.js.handlebars
@@ -99,49 +99,50 @@
       {{render notifications notifications}}
 
       {{#if view.renderSiteMap}}
-      <section class='d-dropdown' id='site-map-dropdown'>
-      <ul class="location-links">
-        {{#if currentUser.staff}}
-          <li><a href="/admin" class="admin-link"><i class='icon icon-wrench'></i>{{i18n admin_title}}</a></li>
-          <li><a href="/admin/flags/active" class="flagged-posts-link"><i class='icon icon-flag'></i>{{i18n flags_title}}</a>
-          {{#if currentUser.site_flagged_posts_count}}
-            <a href='/admin/flags/active' title='{{i18n notifications.total_flagged}}' class='badge-notification flagged-posts'>{{currentUser.site_flagged_posts_count}}</a>
-          {{/if}}
-          </li>
-        {{/if}}
-        <li>
-          {{#titledLinkTo "list.latest" titleKey="filters.latest.help" class="latest-topics-link"}}{{i18n filters.latest.title}}{{/titledLinkTo}}
-        </li>
-        <li>{{faqLink}}</li>
-        {{#if showMobileToggle}}
-          <li>
-            <a href="#" class="mobile-toggle-link" {{action toggleMobileView}}>
-              {{#if mobileView}}
-                {{i18n desktop_view}}
-              {{else}}
-                {{i18n mobile_view}}
-              {{/if}}
-            </a>
-          </li>
-        {{/if}}
-      </ul>
-
-      {{#if categories}}
-        <ul class="category-links">
-          <li class='heading' title="{{i18n filters.categories.help}}">
-            {{#link-to "list.categories"}}{{i18n filters.categories.title}}{{/link-to}}
-          </li>
-
-          {{#each categories}}
-            <li class='category'>
-              {{header-category-info category=this currentUser=controller.currentUser}}
+        <section class='d-dropdown' id='site-map-dropdown'>
+          <ul class="location-links">
+            {{#if currentUser.staff}}
+              <li><a href="/admin" class="admin-link"><i class='icon icon-wrench'></i>{{i18n admin_title}}</a></li>
+              <li>
+                <a href="/admin/flags/active" class="flagged-posts-link"><i class='icon icon-flag'></i>{{i18n flags_title}}</a>
+                {{#if currentUser.site_flagged_posts_count}}
+                  <a href='/admin/flags/active' title='{{i18n notifications.total_flagged}}' class='badge-notification flagged-posts'>{{currentUser.site_flagged_posts_count}}</a>
+                {{/if}}
+              </li>
+            {{/if}}
+            <li>
+              {{#titledLinkTo "list.latest" titleKey="filters.latest.help" class="latest-topics-link"}}{{i18n filters.latest.title}}{{/titledLinkTo}}
             </li>
-          {{/each}}
-        </ul>
-      {{/if}}
+            <li>{{faqLink}}</li>
+            {{#if showMobileToggle}}
+              <li>
+                <a href="#" class="mobile-toggle-link" {{action toggleMobileView}}>
+                  {{#if mobileView}}
+                    {{i18n desktop_view}}
+                  {{else}}
+                    {{i18n mobile_view}}
+                  {{/if}}
+                </a>
+              </li>
+            {{/if}}
+          </ul>
 
-    </section>
-    {{/if}}
+          {{#if categories}}
+            <ul class="category-links">
+              <li class='heading' title="{{i18n filters.categories.help}}">
+                {{#link-to "list.categories"}}{{i18n filters.categories.title}}{{/link-to}}
+              </li>
+
+              {{#each categories}}
+                <li class='category'>
+                  {{header-category-info category=this currentUser=controller.currentUser}}
+                </li>
+              {{/each}}
+            </ul>
+          {{/if}}
+
+        </section>
+      {{/if}}
 
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/views/header_view.js b/app/assets/javascripts/discourse/views/header_view.js
index 7212809d5e8..e6d5be2c286 100644
--- a/app/assets/javascripts/discourse/views/header_view.js
+++ b/app/assets/javascripts/discourse/views/header_view.js
@@ -109,7 +109,8 @@ Discourse.HeaderView = Discourse.View.extend({
 
     var headerView = this;
     this.$('a[data-dropdown]').on('click.dropdown', function(e) {
-      return headerView.showDropdown($(e.currentTarget));
+      headerView.showDropdown($(e.currentTarget));
+      return false;
     });
     this.$('a.unread-private-messages, a.unread-notifications, a[data-notifications]').on('click.notifications', function(e) {
       headerView.showNotifications(e);