From 8f1b6eb5619304252712ace5c1448e46edcf2e33 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 26 Aug 2015 16:58:43 -0400
Subject: [PATCH] Move hamburger into header

---
 .../javascripts/discourse/controllers/application.js.es6  | 8 --------
 .../javascripts/discourse/controllers/header.js.es6       | 5 +++++
 .../javascripts/discourse/templates/application.hbs       | 1 -
 app/assets/javascripts/discourse/templates/header.hbs     | 2 ++
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/application.js.es6 b/app/assets/javascripts/discourse/controllers/application.js.es6
index 472bba31520..20eb7f70ad0 100644
--- a/app/assets/javascripts/discourse/controllers/application.js.es6
+++ b/app/assets/javascripts/discourse/controllers/application.js.es6
@@ -4,7 +4,6 @@ export default Ember.Controller.extend({
   showTop: true,
   showFooter: false,
   styleCategory: null,
-  hamburgerVisible: false,
 
   @computed
   canSignUp() {
@@ -16,12 +15,5 @@ export default Ember.Controller.extend({
   @computed
   loginRequired() {
     return Discourse.SiteSettings.login_required && !Discourse.User.current();
-  },
-
-  actions: {
-    toggleHamburgerMenu() {
-      this.toggleProperty('hamburgerVisible');
-    }
   }
-
 });
diff --git a/app/assets/javascripts/discourse/controllers/header.js.es6 b/app/assets/javascripts/discourse/controllers/header.js.es6
index d2bc112186f..352c867c5cc 100644
--- a/app/assets/javascripts/discourse/controllers/header.js.es6
+++ b/app/assets/javascripts/discourse/controllers/header.js.es6
@@ -3,6 +3,7 @@ const HeaderController = Ember.Controller.extend({
   showExtraInfo: null,
   notifications: null,
   loadingNotifications: false,
+  hamburgerVisible: false,
   needs: ['application'],
 
   loginRequired: Em.computed.alias('controllers.application.loginRequired'),
@@ -68,6 +69,10 @@ const HeaderController = Ember.Controller.extend({
         self.refreshNotifications();
       }
       headerView.showDropdownBySelector("#user-notifications");
+    },
+
+    toggleHamburgerMenu() {
+      this.toggleProperty('hamburgerVisible');
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/templates/application.hbs b/app/assets/javascripts/discourse/templates/application.hbs
index 53cf8fd5c09..cd89910d140 100644
--- a/app/assets/javascripts/discourse/templates/application.hbs
+++ b/app/assets/javascripts/discourse/templates/application.hbs
@@ -1,5 +1,4 @@
 {{render "header"}}
-{{hamburger-menu hamburgerVisible=hamburgerVisible showKeyboardAction="showKeyboardShortcutsHelp"}}
 
 <div id="main-outlet" class="wrap">
   <div class="container">
diff --git a/app/assets/javascripts/discourse/templates/header.hbs b/app/assets/javascripts/discourse/templates/header.hbs
index 7831fe9c61a..c58e214b07f 100644
--- a/app/assets/javascripts/discourse/templates/header.hbs
+++ b/app/assets/javascripts/discourse/templates/header.hbs
@@ -1,3 +1,5 @@
+{{hamburger-menu hamburgerVisible=hamburgerVisible showKeyboardAction="showKeyboardShortcutsHelp"}}
+
 <div class='wrap'>
   <div class='contents clearfix'>
     {{home-logo minimized=showExtraInfo}}