From fc3e1c6c9b8d2e2620f74b4ac983eda48b7242b1 Mon Sep 17 00:00:00 2001
From: kholliday <krh121791@gmail.com>
Date: Sun, 8 Mar 2015 15:35:37 -0500
Subject: [PATCH] Added ability to remove pet, mount, and background. Also,
 changed text for all dequip buttons.

---
 common/locales/en/character.json              |  4 +-
 .../public/js/controllers/inventoryCtrl.js    | 47 +++++++++++++------
 .../views/options/inventory/inventory.jade    |  9 ++--
 3 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/common/locales/en/character.json b/common/locales/en/character.json
index 688131c945..ce734d7584 100644
--- a/common/locales/en/character.json
+++ b/common/locales/en/character.json
@@ -134,5 +134,7 @@
     "displayNameDescription1": "This is what appears in messages you post in the Tavern, guilds, and party chat, along with what is displayed on your avatar. Go to",
     "displayNameDescription2": "Settings->Site",
     "displayNameDescription3": "and scroll down to the Registration section to change your login name.",
-    "dequipAll": "Dequip All"
+    "unequipBattleGear": "Unequip Battle Gear",
+    "unequipCostume": "Unequip Costume",
+    "unequipPetMountBackground": "Unequip Pet, Mount, Background"
 }
diff --git a/website/public/js/controllers/inventoryCtrl.js b/website/public/js/controllers/inventoryCtrl.js
index d6fb4720e1..f2e8d36d01 100644
--- a/website/public/js/controllers/inventoryCtrl.js
+++ b/website/public/js/controllers/inventoryCtrl.js
@@ -234,24 +234,43 @@ habitrpg.controller("InventoryCtrl",
       return filteredArray;
     };
 
-    $scope.dequip = function(gearSet){
+    $scope.dequip = function(itemSet){
 
-      if ( gearSet == "battleGear" ) {
-        for ( item in user.items.gear.equipped ){
-          var itemKey = user.items.gear.equipped[item];
-          if ( user.items.gear.owned[itemKey] ) {
-            user.ops.equip({params: {key: itemKey}});
+      switch (itemSet) {
+        case "battleGear":
+          for ( item in user.items.gear.equipped ){
+            var itemKey = user.items.gear.equipped[item];
+            if ( user.items.gear.owned[itemKey] ) {
+              user.ops.equip({params: {key: itemKey}});
+            }
           }
-        }
-      }
+          break;
 
-      if ( gearSet == "costume" ) {
-        for ( item in user.items.gear.costume ){
-          var itemKey = user.items.gear.costume[item];
-          if ( user.items.gear.owned[itemKey] ) {
-            user.ops.equip({params: {type:"costume", key: itemKey}});
+        case "costume":
+          for ( item in user.items.gear.costume ){
+            var itemKey = user.items.gear.costume[item];
+            if ( user.items.gear.owned[itemKey] ) {
+              user.ops.equip({params: {type:"costume", key: itemKey}});
+            }
           }
-        }
+          break;
+
+        case "petMountBackground":
+
+          var pet = user.items.currentPet;
+          if ( pet ) {
+            user.ops.equip({params:{type: 'pet', key: pet}});
+          }
+
+          var mount = user.items.currentMount;
+          if ( mount ) {
+            user.ops.equip({params:{type: 'mount', key: mount}});
+          }
+
+          var background = user.preferences.background;
+          User.user.ops.unlock({query:{path:"background."+background}});
+
+          break;
       }
 
     }
diff --git a/website/views/options/inventory/inventory.jade b/website/views/options/inventory/inventory.jade
index 6e6b3e38b5..5151c0b102 100644
--- a/website/views/options/inventory/inventory.jade
+++ b/website/views/options/inventory/inventory.jade
@@ -3,8 +3,8 @@ script(type='text/ng-template', id='partials/options.inventory.equipment.html')
     .row
       .col-md-6.border-right
         h3.equipment-title.hint(popover-trigger='mouseenter', popover-placement='top', popover-append-to-body='true', popover=env.t('battleGearText'))=env.t('battleGear')
-        div(ng-click='dequip("battleGear");')
-          button.btn.btn-default(type="button") {{env.t("dequipAll")}}
+        div
+          button.btn.btn-default(type="button", ng-click='dequip("battleGear");') {{env.t("unequipBattleGear")}}
         li.customize-menu.inventory-gear
           menu.pets-menu(label='{{::label}}', ng-repeat='(klass,label) in {warrior:env.t("warrior"), wizard:env.t("mage"), rogue:env.t("rogue"), healer:env.t("healer"), special:env.t("special"), mystery:env.t("mystery")}', ng-show='gear[klass]')
             div(ng-repeat='item in gear[klass]')
@@ -16,8 +16,9 @@ script(type='text/ng-template', id='partials/options.inventory.equipment.html')
             input(type="checkbox", ng-model="user.preferences.costume", ng-change='set({"preferences.costume":user.preferences.costume ? true : false})')
             |&nbsp;
             =env.t('useCostume')
-        div(ng-click='dequip("costume");')
-          button.btn.btn-default(type="button") {{env.t("dequipAll")}}
+        div
+          button.btn.btn-default(type="button", ng-click='dequip("costume");') {{env.t("unequipCostume")}}
+          button.btn.btn-default(type="button", ng-click='dequip("petMountBackground");') {{env.t("unequipPetMountBackground")}}
         li.customize-menu(ng-if='user.preferences.costume')
           menu.pets-menu(label='{{::label}}', ng-repeat='(klass,label) in {warrior:env.t("warrior"), wizard:env.t("mage"), rogue:env.t("rogue"), healer:env.t("healer"), special:env.t("special"), mystery:env.t("mystery")}', ng-show='gear[klass]')
             div(ng-repeat='item in gear[klass]')