Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2439 from diablomarcus/potatoe-fix

Browse Source 
Fixes feeding modal display text
This commit is contained in:
Cole Gleason
2014-01-17 18:38:40 -08:00
parent d6f8cf4a73 7179a30827
commit b4cb3e4c78
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/controllers/inventoryCtrl.js
+3 -2
View File
@@ -92,14 +92,15 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', '$window', 'User',
}
$scope.choosePet = function(egg, potion){
var pet = egg + '-' + potion;
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 + ' a ' + food.key + '?')) {
} else if (!$window.confirm('Feed ' + petDisplayName + ' '+ food.article + food.text + '?')) {
return;
}
User.user.ops.feed({params:{pet: pet, food: food.key}});