sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 12:02:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed broken test for display name

Browse source
This commit is contained in:
diablo 2014-01-17 19:16:40 -06:00
parent 16c38634b6
commit 7179a30827
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
public/js/controllers/inventoryCtrl.js
View file

@ -92,14 +92,15 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', '$window', 'User',
}
$scope.choosePet = function(egg, potion){
var pet = potion + " " + egg;
var petDisplayName = potion + " " + egg,
pet = egg + '-' + potion;
// Feeding Pet
if ($scope.selectedFood) {
var food = $scope.selectedFood
if (food.key == 'Saddle') {
if (!$window.confirm('Saddle ' + pet + '?')) return;
} else if (!$window.confirm('Feed ' + pet + ' '+ food.article + food.text + '?')) {
} else if (!$window.confirm('Feed ' + petDisplayName + ' '+ food.article + food.text + '?')) {
return;
}
User.user.ops.feed({params:{pet: pet, food: food.key}});