From 92bfc66c6744fd7b839a674a93c5de3cbb5dfaa3 Mon Sep 17 00:00:00 2001
From: Alys <alice.harris@oldgods.net>
Date: Sun, 12 Jul 2015 18:18:31 +1000
Subject: [PATCH] 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

---
 website/public/js/controllers/rootCtrl.js      | 7 ++++---
 website/views/options/inventory/equipment.jade | 4 ++--
 website/views/options/profile.jade             | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

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