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

fix hardcoded total pets count

Browse Source
This commit is contained in:
Dušan Juretić
2013-09-18 11:07:23 -03:00
parent 9ec3c4aaed
commit c6472bc615
2 changed files with 2 additions and 1 deletions
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.userCurrentPet = User.user.items.currentPet;
$scope.pets = window.habitrpgShared.items.items.pets; $scope.pets = window.habitrpgShared.items.items.pets;
$scope.hatchingPotions = window.habitrpgShared.items.items.hatchingPotions; $scope.hatchingPotions = window.habitrpgShared.items.items.hatchingPotions;
$scope.totalPets = $scope.pets.length * $scope.hatchingPotions.length;
$scope.hasPet = function(name, potion){ $scope.hasPet = function(name, potion){
if (!$scope.userPets) return false; if (!$scope.userPets) return false;

2
views/options/pets.jade
View File

@@ -11,7 +11,7 @@
| ! Until that day, | ! 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 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. | 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') table.pets(ng-repeat='pet in pets')
tbody tbody