diff --git a/public/js/controllers/menuCtrl.js b/public/js/controllers/menuCtrl.js index aaf2760ac3..54958860a9 100644 --- a/public/js/controllers/menuCtrl.js +++ b/public/js/controllers/menuCtrl.js @@ -16,15 +16,21 @@ habitrpg.controller('MenuCtrl', } $scope.gotoOptions = function(){ - $scope.viewingOptions = true; $location.path('/options'); } $scope.gotoTasks = function(){ - $scope.viewingOptions = false; $location.path('/tasks') } + $scope.$on('$routeChangeSuccess', function(ev, current) { + if(current.$$route.originalPath === "/tasks"){ + $scope.viewingOptions = false; + }else if(current.$$route.originalPath === "/options"){ + $scope.viewingOptions = true; + } + }); + //FIXME where to implement this in rewrite? diff --git a/views/shared/header/menu.jade b/views/shared/header/menu.jade index 5d19ba2184..5908bf27aa 100644 --- a/views/shared/header/menu.jade +++ b/views/shared/header/menu.jade @@ -5,7 +5,7 @@ h1.task-action-btn.tile.solid.user-reporter {{username(user.auth, user.profile.name)}} ul.flyout-content.nav.stacked li - a.task-action-btn.tile.solid(x-bind='click:toggleGamePane') + a.task-action-btn.tile.solid span(ng-show='viewingOptions', ng-click='gotoTasks()') i.icon-ok | Tasks