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

fix a bug where if you had "Use Costume" ticked, any Battle Gear or Costume choice would be added to your costume, never to Battle Gear

Browse Source
This commit is contained in:
Alys
2015-07-12 18:18:31 +10:00
parent 18db504d2a
commit 92bfc66c67
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
website/public/js/controllers/rootCtrl.js
View File

@@ -211,12 +211,13 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
} }
// @TODO: Extract equip and purchase into equipment service // @TODO: Extract equip and purchase into equipment service
$rootScope.equip = function(itemKey) { $rootScope.equip = function(itemKey, equipType) {
var equipType = user.preferences.costume ? 'costume' : 'equipped';
var equipParams = { var equipParams = {
type: equipType, type: equipType || 'costume',
key: itemKey key: itemKey
}; };
// 'costume' default is in case I have missed any code that uses this.
// @TODO: Remove when we're sure it's not needed.
user.ops.equip({ params: equipParams }); user.ops.equip({ params: equipParams });
} }

4
website/views/options/inventory/equipment.jade
View File

@@ -14,7 +14,7 @@
div(ng-repeat='item in gear[klass]') div(ng-repeat='item in gear[klass]')
button.customize-option(class='shop_{{::item.key}}', button.customize-option(class='shop_{{::item.key}}',
ng-class='{selectableInventory: user.items.gear.equipped[item.type] == item.key}', ng-class='{selectableInventory: user.items.gear.equipped[item.type] == item.key}',
ng-click='equip(item.key)', ng-click='equip(item.key, "equipped")',
popover='{{::item.notes()}}', popover-title='{{::item.text()}}', popover='{{::item.notes()}}', popover-title='{{::item.text()}}',
popover-trigger='mouseenter', popover-placement='right', popover-trigger='mouseenter', popover-placement='right',
popover-append-to-body='true') popover-append-to-body='true')
@@ -50,4 +50,4 @@
popover='{{::item.notes()}}', popover='{{::item.notes()}}',
popover-title='{{::item.text()}}', popover-trigger='mouseenter', popover-title='{{::item.text()}}', popover-trigger='mouseenter',
popover-placement='right', popover-append-to-body='true', popover-placement='right', popover-append-to-body='true',
ng-click='equip(item.key)') ng-click='equip(item.key, "costume")')

2
website/views/options/profile.jade
View File

@@ -66,7 +66,7 @@ mixin customizeProfile(mobile)
ng-class="{locked: user.items.gear.owned[item.key] == undefined, selectableInventory: user.preferences.costume ? user.items.gear.costume.headAccessory == item.key : user.items.gear.equipped.headAccessory == item.key}", ng-class="{locked: user.items.gear.owned[item.key] == undefined, selectableInventory: user.preferences.costume ? user.items.gear.costume.headAccessory == item.key : user.items.gear.equipped.headAccessory == item.key}",
popover='{{::item.notes()}}', popover-title='{{::item.text()}}', popover-trigger='mouseenter', popover='{{::item.notes()}}', popover-title='{{::item.text()}}', popover-trigger='mouseenter',
popover-placement='right', popover-append-to-body='true', popover-placement='right', popover-append-to-body='true',
ng-click='user.items.gear.owned[item.key] ? equip(item.key) : purchase(item.type,item)') ng-click='user.items.gear.owned[item.key] ? equip(item.key, "costume") : purchase(item.type,item)')
.col-md-4 .col-md-4
h3(class=mobile?'item item-divider':'')=env.t('bodyHead') h3(class=mobile?'item item-divider':'')=env.t('bodyHead')