mirror of
https://github.com/sudoxnym/habitica-self-host.git
synced 2026-07-31 19:20:25 +00:00
revive button name conflict! We gotta do somethign about shared/helpers
exposed to the view
This commit is contained in:
parent
7c6174e218
commit
2f3da075f8
2 changed files with 3 additions and 2 deletions
|
|
@ -94,7 +94,8 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User', '
|
|||
/* TODO this should be somewhere else, but fits the html location better here
|
||||
*/
|
||||
|
||||
$rootScope.revive = function() {
|
||||
// uhoh! our first name conflict with habitrpg-shared/helpers, we gotta resovle that soon.
|
||||
$rootScope.clickRevive = function() {
|
||||
window.habitrpgShared.algos.revive(User.user);
|
||||
User.log({
|
||||
op: "revive"
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ div(modal='user.stats.hp <= 0', options='{backdrop:true, keyboard:false, backdro
|
|||
.row-fluid
|
||||
.span4
|
||||
p
|
||||
a.btn.btn-danger.btn-large.notification-action(ng-click='revive()') Continue
|
||||
a.btn.btn-danger.btn-large.notification-action(ng-click='clickRevive()') Continue
|
||||
.span8
|
||||
p
|
||||
| You've lost a level, all your gold, and a random piece of equipment. Arise, Habiteer, and try again! Curb those negative Habits, be vigilant in completion of Dailies, and hold death at arm's length with a Potion if you falter!
|
||||
|
|
|
|||
Loading…
Reference in a new issue