krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix #1635

Browse Source
This commit is contained in:
Matteo Pagliazzi
2013-10-23 16:38:05 +02:00
parent 18c06b5043
commit 0c7ba32c6b
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/js/controllers/menuCtrl.js
View File

@@ -16,15 +16,21 @@ habitrpg.controller('MenuCtrl',
} }
$scope.gotoOptions = function(){ $scope.gotoOptions = function(){
$scope.viewingOptions = true;
$location.path('/options'); $location.path('/options');
} }
$scope.gotoTasks = function(){ $scope.gotoTasks = function(){
$scope.viewingOptions = false;
$location.path('/tasks') $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? //FIXME where to implement this in rewrite?

2
views/shared/header/menu.jade
View File

@@ -5,7 +5,7 @@
h1.task-action-btn.tile.solid.user-reporter {{username(user.auth, user.profile.name)}} h1.task-action-btn.tile.solid.user-reporter {{username(user.auth, user.profile.name)}}
ul.flyout-content.nav.stacked ul.flyout-content.nav.stacked
li li
a.task-action-btn.tile.solid(x-bind='click:toggleGamePane') a.task-action-btn.tile.solid
span(ng-show='viewingOptions', ng-click='gotoTasks()') span(ng-show='viewingOptions', ng-click='gotoTasks()')
i.icon-ok i.icon-ok
| Tasks | Tasks