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

Merge pull request #1550 from djuretic/pet_count

Browse source 
Don't hardcode total pets count
This commit is contained in:
Tyler Renelle 2013-09-18 07:15:24 -07:00
commit 205b646cfc
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
public/js/controllers/petsCtrl.js
View file

@ -5,6 +5,7 @@ habitrpg.controller("PetsCtrl", ['$scope', 'User',
$scope.userCurrentPet = User.user.items.currentPet;
$scope.pets = window.habitrpgShared.items.items.pets;
$scope.hatchingPotions = window.habitrpgShared.items.items.hatchingPotions;
$scope.totalPets = $scope.pets.length * $scope.hatchingPotions.length;
$scope.hasPet = function(name, potion){
if (!$scope.userPets) return false;

2
views/options/pets.jade
View file

@ -11,7 +11,7 @@
| ! Until that day,
a(target='_blank', href='https://f.cloud.github.com/assets/2374703/164631/3ed5fa6c-78cd-11e2-8743-f65ac477b55e.png') have a look-see
| at all the pets you can collect.
h4 {{userPets.length}} / 90 Pets Found
h4 {{userPets.length}} / {{totalPets}} Pets Found
table.pets(ng-repeat='pet in pets')
tbody