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

Merge branch 'api-v3-client-tests' of https://github.com/TheHollidayInn/habitrpg into TheHollidayInn-api-v3-client-tests2

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-05-08 16:59:15 +02:00
parent 4c37417bd4 a7c6457d79
commit 34251ca7fc
15 changed files with 297 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/public/js/controllers/challengesCtrl.js
View File

@@ -263,7 +263,7 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
});
}
$scope.leave = function(keep) {
$scope.leave = function(keep, challenge) {
if (keep == 'cancel') {
$scope.selectedChal = undefined;
} else {