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

Allow animal ears to be added to costume or equipped gear

Browse Source
This commit is contained in:
Blade Barringer
2015-07-12 09:13:27 -05:00
parent d09b24e1a5
commit 6ac049cc71
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,12 +212,11 @@ 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, equipType) { $rootScope.equip = function(itemKey, equipType) {
equipType = equipType || (user.preferences.costume ? 'costume' : 'equipped');
var equipParams = { var equipParams = {
type: equipType || 'costume', type: equipType,
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 });
} }

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, "costume") : purchase(item.type,item)') ng-click='user.items.gear.owned[item.key] ? equip(item.key) : 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')