krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 07:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[#1476] re-order "you already have this combo" message to bail early

Browse Source
This commit is contained in:
Tyler Renelle
2013-09-08 22:42:59 -04:00
parent a461bda7b8
commit 55dffcc317
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
public/js/controllers/inventoryCtrl.js
View File

@@ -16,18 +16,18 @@ habitrpg.controller("InventoryCtrl", ['$scope', 'User',
}
$scope.pour = function(){
var pet = $scope.selectedEgg.name + '-' + $scope.selectedPotion;
if(User.user.items.pets && ~User.user.items.pets.indexOf(pet)) {
return alert("You already have that pet, hatch a different combo.")
}
var i = _.indexOf($scope.userEggs, $scope.selectedEgg);
$scope.userEggs.splice(i, 1);
i = _.indexOf($scope.userHatchingPotions, $scope.selectedPotion);
$scope.userHatchingPotions.splice(i, 1);
var pet = $scope.selectedEgg.name + '-' + $scope.selectedPotion;
if(User.user.items.pets && User.user.items.pets.indexOf(pet) != -1) {
return alert("You already have that pet, hatch a different combo.")
}
if(!User.user.items.pets) User.user.items.pets = [];
User.user.items.pets.push(pet);