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

re-add the dequip option for removing backgrounds with proper bug fix (ref 9199c6c7e2); make whitespace consistent

Browse Source
This commit is contained in:
Alice Harris
2015-03-16 19:27:44 +10:00
parent ca796e294f
commit 44259925e4
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
website/public/js/controllers/inventoryCtrl.js
View File

@@ -235,46 +235,43 @@ habitrpg.controller("InventoryCtrl",
};
$scope.dequip = function(itemSet){
switch (itemSet) {
case "battleGear":
for ( item in user.items.gear.equipped ){
for (item in user.items.gear.equipped){
var itemKey = user.items.gear.equipped[item];
if ( user.items.gear.owned[itemKey] ) {
if (user.items.gear.owned[itemKey]) {
user.ops.equip({params: {key: itemKey}});
}
}
break;
case "costume":
for ( item in user.items.gear.costume ){
for (item in user.items.gear.costume){
var itemKey = user.items.gear.costume[item];
if ( user.items.gear.owned[itemKey] ) {
if (user.items.gear.owned[itemKey]) {
user.ops.equip({params: {type:"costume", key: itemKey}});
}
}
break;
case "petMountBackground":
var pet = user.items.currentPet;
if ( pet ) {
if (pet) {
user.ops.equip({params:{type: 'pet', key: pet}});
}
var mount = user.items.currentMount;
if ( mount ) {
if (mount) {
user.ops.equip({params:{type: 'mount', key: mount}});
}
// var background = user.preferences.background;
// User.user.ops.unlock({query:{path:"background."+background}});
// commented out until we fix this bug:
// https://github.com/HabitRPG/habitrpg/issues/4857#issuecomment-80722868
var background = user.preferences.background;
if (background) {
User.user.ops.unlock({query:{path:"background."+background}});
}
break;
}
}
};
}
]);