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

upgrade lodash to 2.2.1

Browse Source
This commit is contained in:
Matteo Pagliazzi
2013-11-02 09:52:48 +01:00
parent 898adfdc13
commit 5a103db716
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -20,7 +20,7 @@
"resolve": "~0.2.3", "resolve": "~0.2.3",
"expect.js": "~0.2.0", "expect.js": "~0.2.0",
"relative-date": "~1.1.1", "relative-date": "~1.1.1",
"lodash": "~1.3.1", "lodash": "~2.2.1",
"async": "~0.2.9", "async": "~0.2.9",
"optimist": "~0.5.2", "optimist": "~0.5.2",
"mongoose": "~3.6.20", "mongoose": "~3.6.20",

6
public/js/controllers/groupsCtrl.js
View File

@@ -47,9 +47,9 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Groups', '$http', 'A
if(yes){ if(yes){
group.$removeMember({uuid: member._id}); group.$removeMember({uuid: member._id});
if(isMember){ if(isMember){
group.members = _.without(group.members, member); _.pull(group.members, member);
}else{ }else{
group.invites = _.without(group.invites, member); _.pull(group.invites, member);
} }
} }
} }
@@ -169,7 +169,7 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Groups', '$http', 'A
// remove user from group members if guild is public so that he can re-join it immediately // remove user from group members if guild is public so that he can re-join it immediately
if(group.privacy == 'public'){ if(group.privacy == 'public'){
// slow when a lot of members...? probably yes // slow when a lot of members...? probably yes
group.members = _.without(group.members, User.user._id); _.remove(group.members, {_id: User.user._id});
group.memberCount--; group.memberCount--;
} }
$state.go('options.social.guilds'); $state.go('options.social.guilds');

2
src/controllers/groups.js
View File

@@ -243,7 +243,7 @@ api.deleteChatMessage = function(req, res, next){
return res.json(401, {err: "Not authorized to delete this message!"}) return res.json(401, {err: "Not authorized to delete this message!"})
} }
group.chat = _.without(group.chat, message); _.pull(group.chat, message);
group.save(function(err, data){ group.save(function(err, data){
if(err) return res.json(500, {err: err}); if(err) return res.json(500, {err: err});