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

Move getChallenges private method to bottom of file

Browse Source
This commit is contained in:
Blade Barringer
2015-07-24 10:17:09 -05:00
parent 061e6dbfa5
commit f8e2e74336
1 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,27 +7,7 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
// challenge // challenge
$scope.cid = $state.params.cid; $scope.cid = $state.params.cid;
// Fetch single challenge if a cid is present; fetch multiple challenges _getChallenges();
// otherwise
var getChallenges = function() {
if ($scope.cid) {
Challenges.Challenge.get({cid: $scope.cid}, function(challenge) {
$scope.challenges = [challenge];
});
} else {
Challenges.Challenge.query(function(challenges){
$scope.challenges = challenges;
$scope.groupsFilter = _.uniq(_.pluck(challenges, 'group'), function(g){return g._id});
$scope.search = {
group: _.transform($scope.groups, function(m,g){m[g._id]=true;}),
_isMember: "either",
_isOwner: "either"
};
});
}
};
getChallenges();
// FIXME $scope.challenges needs to be resolved first (see app.js) // FIXME $scope.challenges needs to be resolved first (see app.js)
$scope.groups = Groups.Group.query({type:'party,guilds,tavern'}); $scope.groups = Groups.Group.query({type:'party,guilds,tavern'});
@@ -351,7 +331,24 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
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);
return groupSelected && checkOwner && checkMember; // Fetch single challenge if a cid is present; fetch multiple challenges
} // otherwise
function _getChallenges() {
if ($scope.cid) {
Challenges.Challenge.get({cid: $scope.cid}, function(challenge) {
$scope.challenges = [challenge];
});
} else {
Challenges.Challenge.query(function(challenges){
$scope.challenges = challenges;
$scope.groupsFilter = _.uniq(_.pluck(challenges, 'group'), function(g){return g._id});
$scope.search = {
group: _.transform($scope.groups, function(m,g){m[g._id]=true;}),
_isMember: "either",
_isOwner: "either"
};
});
}
};
}]); }]);