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

Updated comments and removed extra console.log

Browse Source
This commit is contained in:
TheHollidayInn
2015-04-23 08:58:40 -05:00
parent f3f1bd4d8e
commit ad2ad70421
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/spec/challengesCtrlSpec.js
View File

@@ -27,9 +27,9 @@ describe('Challenges Controller', function() {
it('filters challenges', function() { it('filters challenges', function() {
//There are for types of challenges //There are four types of challenges
//You can be the owner and a member // You are the owner and a member
var ownMem = new challenges.Challenge({ var ownMem = new challenges.Challenge({
name: 'test', name: 'test',
description: 'test', description: 'test',
@@ -45,7 +45,7 @@ describe('Challenges Controller', function() {
_isMember: true _isMember: true
}); });
//You can be the owner and not a member // You are the owner but not a member
var ownNotMem = new challenges.Challenge({ var ownNotMem = new challenges.Challenge({
name: 'test', name: 'test',
description: 'test', description: 'test',
@@ -61,7 +61,7 @@ describe('Challenges Controller', function() {
_isMember: false _isMember: false
}); });
//You not be the owner and a member // You are not the owner but you are a member
var notOwnMem = new challenges.Challenge({ var notOwnMem = new challenges.Challenge({
name: 'test', name: 'test',
description: 'test', description: 'test',
@@ -77,7 +77,7 @@ describe('Challenges Controller', function() {
_isMember: true _isMember: true
}); });
//You not be the owner and not a member // You are not the owner or a member
var notOwnNotMem = new challenges.Challenge({ var notOwnNotMem = new challenges.Challenge({
name: 'test', name: 'test',
description: 'test', description: 'test',

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

@@ -267,7 +267,7 @@ habitrpg.controller("ChallengesCtrl", ['$rootScope','$scope', 'Shared', 'User',
//Membership filters: Show if user has selected either or has selcted Owned and is owner //Membership filters: Show if user has selected either or has selcted Owned and is owner
var userIsOwner = chal.leader._id == User.user.id; var userIsOwner = chal.leader._id == User.user.id;
showChallenge = showChallenge && (typeof $scope.search._isOwner === 'undefined' || userIsOwner === $scope.search._isOwner ); showChallenge = showChallenge && (typeof $scope.search._isOwner === 'undefined' || userIsOwner === $scope.search._isOwner );
console.log($scope.search._isMember, chal._isMember)
//Membership filters: Show if user has selected either or has selcted Participating and is a member //Membership filters: Show if user has selected either or has selcted Participating and is a member
showChallenge = showChallenge && (typeof $scope.search._isMember === 'undefined' || $scope.search._isMember === chal._isMember); showChallenge = showChallenge && (typeof $scope.search._isMember === 'undefined' || $scope.search._isMember === chal._isMember);