From cbb106e12e72b8ccc9f6834098f395a534aad0f9 Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Thu, 20 Aug 2015 15:44:52 +0100 Subject: [PATCH] Mobile nav menu fixes issue #5483 & #5652 - trigger the close menus action every time a route transition is successful - close nav menu when clicking "collapse sidebar" button (action chain was incomplete) --- core/client/app/routes/application.js | 4 ++++ core/client/app/templates/application.hbs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/client/app/routes/application.js b/core/client/app/routes/application.js index ed92f6e33e..39ea40adce 100644 --- a/core/client/app/routes/application.js +++ b/core/client/app/routes/application.js @@ -48,6 +48,10 @@ export default Ember.Route.extend(ApplicationRouteMixin, ShortcutsRoute, { }); }, + didTransition: function () { + this.send('closeMenus'); + }, + signedIn: function () { this.send('loadServerNotifications', true); }, diff --git a/core/client/app/templates/application.hbs b/core/client/app/templates/application.hbs index efa0bfe32c..256fbf3e4d 100644 --- a/core/client/app/templates/application.hbs +++ b/core/client/app/templates/application.hbs @@ -5,7 +5,7 @@
{{#unless signedOut}} - {{gh-nav-menu open=autoNavOpen onMouseEnter="openAutoNav" toggleMaximise="toggleAutoNav" openModal="openModal"}} + {{gh-nav-menu open=autoNavOpen onMouseEnter="openAutoNav" toggleMaximise="toggleAutoNav" openModal="openModal" closeMobileMenu="closeMobileMenu"}} {{/unless}} {{#gh-main onMouseEnter="closeAutoNav" data-notification-count=topNotificationCount}}