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

Added releaseBoth script and refactored keys to the kennel modal

Browse source
This commit is contained in:
Blade Barringer 2015-01-02 13:33:41 -06:00
parent 1049e5e152
commit 406edcb761
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
public/js/controllers/settingsCtrl.js
View file

@ -165,6 +165,11 @@ habitrpg.controller('SettingsCtrl',
$rootScope.$state.go('tasks');
}
$scope.releaseBoth = function() {
User.user.ops.releaseBoth({});
$rootScope.$state.go('tasks');
}
// ---- Webhooks ------
$scope._newWebhook = {url:''};
$scope.$watch('user.preferences.webhooks',function(webhooks){

22
views/shared/modals/drops.jade
View file

@ -31,10 +31,18 @@ script(type='text/ng-template', id='modals/pet-key.html')
span(ng-if='user.balance < 1')
a.btn.btn-success(ng-click='openModal("buyGems")')=env.t('buyMoreGems')
span.gem-cost=env.t('notEnoughGems')
span(ng-if='user.balance >= 1', ng-controller='SettingsCtrl')
a.btn.btn-danger(ng-click='$close(); releasePets()')=env.t('petKeyPets')
span(ng-if='user.balance >= 1', ng-controller='SettingsCtrl')
a.btn.btn-danger(ng-click='$close(); releaseMounts()')=env.t('petKeyMounts')
span.gem-cost
| 4&nbsp;
=env.t('gemsEach')
span(ng-if='user.balance >= 1 && user.petCount >= 90', ng-controller='SettingsCtrl')
a.btn.btn-danger(ng-click='$close(); releasePets()')
=env.t('petKeyPets')
| : 4&nbsp;
span.Pet_Currency_Gem1x.inline-gems
span(ng-if='user.balance >= 1 && user.mountCount >= 90', ng-controller='SettingsCtrl')
a.btn.btn-danger(ng-click='$close(); releaseMounts()')
=env.t('petKeyMounts')
| : 4&nbsp;
span.Pet_Currency_Gem1x.inline-gems
span(ng-if='user.balance >= 1 && user.petCount >= 90 && user.mountCount >= 90', ng-controller='SettingsCtrl')
a.btn.btn-danger(ng-click='$close(); releaseBoth()')
=env.t('petKeyBoth')
| : 6&nbsp;
span.Pet_Currency_Gem1x.inline-gems