From bfbc907fa1fb066488d29da353207c09e0db3f73 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Sun, 10 Nov 2013 22:53:20 -0800
Subject: [PATCH] mounts: show when selectedFood by green-circle highlighting
 pets

---
 public/css/inventory.styl              | 1 +
 public/js/controllers/inventoryCtrl.js | 1 +
 views/options/inventory/stable.jade    | 8 ++++----
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/public/css/inventory.styl b/public/css/inventory.styl
index 77820be8ba..f9ed52f076 100644
--- a/public/css/inventory.styl
+++ b/public/css/inventory.styl
@@ -134,6 +134,7 @@ menu.pets .customize-menu
 
 .selectableInventory
   background-color: lightgreen !important
+  border-radius: 50%
 
 .sell-inventory
   width: 162px
diff --git a/public/js/controllers/inventoryCtrl.js b/public/js/controllers/inventoryCtrl.js
index 351d9d6f7b..ce090d18ec 100644
--- a/public/js/controllers/inventoryCtrl.js
+++ b/public/js/controllers/inventoryCtrl.js
@@ -47,6 +47,7 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', 'User', 'API_URL',
     }
 
     $scope.chooseFood = function(food){
+      if ($scope.selectedFood && $scope.selectedFood.name == food) return $scope.selectedFood = null;
       $scope.selectedFood = $scope.Items.food[food];
     }
 
diff --git a/views/options/inventory/stable.jade b/views/options/inventory/stable.jade
index f8b03bf388..151a60beff 100644
--- a/views/options/inventory/stable.jade
+++ b/views/options/inventory/stable.jade
@@ -54,7 +54,7 @@ script(type='text/ng-template', id='partials/options.inventory.stable.pets.html'
       li.customize-menu(ng-repeat='egg in Items.eggs')
         menu
           div(ng-repeat='potion in Items.hatchingPotions', tooltip='{{potion.name}} {{egg.name}}', ng-init='pet = egg.name+"-"+potion.name')
-            button(class="pet-button Pet-{{pet}}", ng-if='user.items.pets[pet]>0', ng-class='{active: user.items.currentPet == pet}', ng-click='choosePet(egg.name, potion.name)')
+            button(class="pet-button Pet-{{pet}}", ng-if='user.items.pets[pet]>0', ng-class='{active: user.items.currentPet == pet, selectableInventory: selectedFood}', ng-click='choosePet(egg.name, potion.name)')
               .progress(ng-class='{"progress-success": user.items.pets[pet]<50}')
                 .bar(style="width: {{user.items.pets[pet]/.5}}%;")
             button(class="pet-button pet-not-owned", ng-if='!user.items.pets[pet]')
@@ -63,9 +63,9 @@ script(type='text/ng-template', id='partials/options.inventory.stable.pets.html'
     h4 Rare Pets
     menu
       div
-        button(ng-if='user.items.pets["Wolf-Veteran"]', class="pet-button Pet-Wolf-Veteran", ng-class='{active: user.items.currentPet == "Wolf-Veteran")}', ng-click='choosePet("Wolf", "Veteran")', tooltip='Veteran Wolf')
-        button(ng-if='user.items.pets["Wolf-Cerberus"]', class="pet-button Pet-Wolf-Cerberus", ng-class='{active: user.items.currentPet == "Wolf-Cerberus")}', ng-click='choosePet("Wolf", "Cerberus")', tooltip='Cerberus Pup')
-        button(ng-if='user.items.pets["Dragon-Hydra"]', class="pet-button Pet-Dragon-Hydra", ng-class='{active: user.items.currentPet == "Dragon-Hydra")}', ng-click='choosePet("Dragon", "Hydra")', tooltip='Hydra Pet')
+        button(ng-if='user.items.pets["Wolf-Veteran"]', class="pet-button Pet-Wolf-Veteran", ng-class='{active: user.items.currentPet == "Wolf-Veteran"}', ng-click='choosePet("Wolf", "Veteran")', tooltip='Veteran Wolf')
+        button(ng-if='user.items.pets["Wolf-Cerberus"]', class="pet-button Pet-Wolf-Cerberus", ng-class='{active: user.items.currentPet == "Wolf-Cerberus"}', ng-click='choosePet("Wolf", "Cerberus")', tooltip='Cerberus Pup')
+        button(ng-if='user.items.pets["Dragon-Hydra"]', class="pet-button Pet-Dragon-Hydra", ng-class='{active: user.items.currentPet == "Dragon-Hydra"}', ng-click='choosePet("Dragon", "Hydra")', tooltip='Hydra Pet')
         a(target='_blank', href='https://github.com/HabitRPG/habitrpg/wiki/Contributing')
           button(ng-if='!user.items.pets["Dragon-Hydra"]', class="pet-button pet-not-owned", popover-trigger='mouseenter', popover-placement='right', popover="Click the gold paw to learn more about how you can obtain this rare pet through contributing to HabitRPG!", popover-title='How to Get this Pet!')
             img(src='/bower_components/habitrpg-shared/img/PixelPaw-Gold.png')