diff --git a/website/public/js/controllers/rootCtrl.js b/website/public/js/controllers/rootCtrl.js index 049fc49e5f..e999a0ef15 100644 --- a/website/public/js/controllers/rootCtrl.js +++ b/website/public/js/controllers/rootCtrl.js @@ -212,12 +212,11 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$ // @TODO: Extract equip and purchase into equipment service $rootScope.equip = function(itemKey, equipType) { + equipType = equipType || (user.preferences.costume ? 'costume' : 'equipped'); var equipParams = { - type: equipType || 'costume', + type: equipType, 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 }); } diff --git a/website/views/options/profile.jade b/website/views/options/profile.jade index 205030af75..bf023047de 100644 --- a/website/views/options/profile.jade +++ b/website/views/options/profile.jade @@ -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}", popover='{{::item.notes()}}', popover-title='{{::item.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', - ng-click='user.items.gear.owned[item.key] ? equip(item.key, "costume") : purchase(item.type,item)') + ng-click='user.items.gear.owned[item.key] ? equip(item.key) : purchase(item.type,item)') .col-md-4 h3(class=mobile?'item item-divider':'')=env.t('bodyHead')