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

Move backToChallenges to private functions section

Browse Source
This commit is contained in:
Blade Barringer
2015-07-24 10:30:02 -05:00
parent fb6a34c2ed
commit eea01216d7
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,13 +141,6 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
* Close Challenge * Close Challenge
* ------------------ * ------------------
*/ */
function backToChallenges(){
$scope.popoverEl.popover('destroy');
$scope.cid = null;
$state.go('options.social.challenges');
$scope.challenges = Challenges.Challenge.query();
User.log({});
}
$scope.cancelClosing = function(challenge) { $scope.cancelClosing = function(challenge) {
$scope.popoverEl.popover('destroy'); $scope.popoverEl.popover('destroy');
$scope.popoverEl = undefined; $scope.popoverEl = undefined;
@@ -164,7 +157,7 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
if (!confirm(warningMsg)) return; if (!confirm(warningMsg)) return;
challenge.$delete(function(){ challenge.$delete(function(){
$scope.popoverEl.popover('destroy'); $scope.popoverEl.popover('destroy');
backToChallenges(); _backToChallenges();
}); });
}; };
$scope.selectWinner = function(challenge) { $scope.selectWinner = function(challenge) {
@@ -172,7 +165,7 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
if (!confirm(window.env.t('youSure'))) return; if (!confirm(window.env.t('youSure'))) return;
challenge.$close({uid:challenge.winner}, function(){ challenge.$close({uid:challenge.winner}, function(){
$scope.popoverEl.popover('destroy'); $scope.popoverEl.popover('destroy');
backToChallenges(); _backToChallenges();
}) })
} }
$scope.close = function(challenge, $event) { $scope.close = function(challenge, $event) {
@@ -326,6 +319,14 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
// case where a challenge's leader deletes their account // case where a challenge's leader deletes their account
var userIsOwner = (chal.leader && chal.leader._id) == User.user.id; var userIsOwner = (chal.leader && chal.leader._id) == User.user.id;
function _backToChallenges(){
$scope.popoverEl.popover('destroy');
$scope.cid = null;
$state.go('options.social.challenges');
$scope.challenges = Challenges.Challenge.query();
User.log({});
}
var groupSelected = $scope.search.group[chal.group._id]; var groupSelected = $scope.search.group[chal.group._id];
var checkOwner = $scope.search._isOwner === 'either' || (userIsOwner === $scope.search._isOwner); var checkOwner = $scope.search._isOwner === 'either' || (userIsOwner === $scope.search._isOwner);
var checkMember = $scope.search._isMember === 'either' || (chal._isMember === $scope.search._isMember); var checkMember = $scope.search._isMember === 'either' || (chal._isMember === $scope.search._isMember);