diff --git a/assets/js/controllers/tasksCtrl.js b/assets/js/controllers/tasksCtrl.js index 18ddb59fe3..eb29be6877 100644 --- a/assets/js/controllers/tasksCtrl.js +++ b/assets/js/controllers/tasksCtrl.js @@ -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" diff --git a/views/shared/modals/death.jade b/views/shared/modals/death.jade index 49860e9ef1..0d19d36a65 100644 --- a/views/shared/modals/death.jade +++ b/views/shared/modals/death.jade @@ -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!