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

Merge branch 'develop' of github.com:lefnire/habitrpg into develop

Browse source
This commit is contained in:
Tyler Renelle 2013-09-12 16:43:18 -04:00
commit d3ddbae767
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
public/js/services/guideServices.js
View file

@ -51,6 +51,7 @@ angular.module('guideServices', []).
$('.main-herobox').popover('destroy'); $('.main-herobox').popover('destroy');
var tour = new Tour({ var tour = new Tour({
onEnd: function(){ onEnd: function(){
User.user.flags.showTour = false;
User.log({op:'set',data:{'flags.showTour':false}}); User.log({op:'set',data:{'flags.showTour':false}});
} }
}); });

4
views/options/market.jade
View file

@ -15,13 +15,13 @@
li.customize-menu li.customize-menu
menu.pets-menu(label='Eggs') menu.pets-menu(label='Eggs')
div(ng-repeat='egg in eggs track by $index') div(ng-repeat='egg in eggs track by $index')
button.customize-option(tooltip='{{egg.text}}', ng-click='buy("egg", egg)', class='Pet_Egg_{{egg.name}}') button.customize-option(tooltip='{{egg.text}} - {{egg.value}} Gem(s)', ng-click='buy("egg", egg)', class='Pet_Egg_{{egg.name}}')
p {{egg.text}} p {{egg.text}}
li.customize-menu li.customize-menu
menu.pets-menu(label='Hatching Potions') menu.pets-menu(label='Hatching Potions')
div(ng-repeat='hatchingPotion in hatchingPotions track by $index') div(ng-repeat='hatchingPotion in hatchingPotions track by $index')
button.customize-option(tooltip='{{hatchingPotion.text}}', ng-click='buy("hatchingPotion", hatchingPotion)', class='Pet_HatchingPotion_{{hatchingPotion.name}}') button.customize-option(tooltip='{{hatchingPotion.text}} - {{hatchingPotion.value}} Gem(s)', ng-click='buy("hatchingPotion", hatchingPotion)', class='Pet_HatchingPotion_{{hatchingPotion.name}}')
p {{hatchingPotion.text}} p {{hatchingPotion.text}}