Fixes #136

new action on subnav and call in the main nav to ensure that the settings section is reset
HospitalRun · Jul 11, 2015 · cdc5f56 · cdc5f56
1 parent 4b250e1
commit cdc5f56
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/app/components/nav-menu.js b/app/components/nav-menu.js
@@ -23,12 +23,17 @@ export default Ember.Component.extend(UserSession, {
     }.on('init'),
 
     callNavAction: "navAction",
+    callCloseSettings: "closeSettings",
 
     actions: {
         toggleContent: function() {
             //debugger;
             this.set('isShowing', !this.get('isShowing'));
             this.sendAction('callNavAction', this.nav);
+        },
+
+        resetNav: function() {
+            this.sendAction('callCloseSettings');
         }
     }
 });
diff --git a/app/controllers/navigation.js b/app/controllers/navigation.js
@@ -34,10 +34,16 @@ export default Ember.Controller.extend(ProgressDialog, UserSession, Navigation,
             }
             this.currentOpenNav = nav;
             this.transitionToRoute(nav.route);
+            this.set('isShowingSettings', false);
         },
 
         toggleSettings: function() {
             this.toggleProperty('isShowingSettings');
+        },
+
+        closeSettings: function() {
+            this.set('isShowingSettings', false);
         }
+
     }
 });
diff --git a/app/templates/components/nav-menu.hbs b/app/templates/components/nav-menu.hbs
@@ -9,6 +9,7 @@
   <div class="category-sub-items">
       {{#each nav.subnav}}
         {{#if show}}
+          <div {{action 'resetNav'}}>
           {{#if subroute}}
             {{#link-to route subroute class="category-sub-item nav-link"}}
             <span {{bind-attr class=":octicon iconClass"}}></span>{{title}}
@@ -18,6 +19,7 @@
             <span {{bind-attr class=":octicon iconClass"}}></span>{{title}}
             {{/link-to}}
           {{/if}}
+          </div>
         {{/if}}
       {{/each}}
   </div>