revive button name conflict! We gotta do somethign about shared/helpers

exposed to the view
This commit is contained in:
Tyler Renelle 2013-09-04 15:50:26 -04:00
parent 7c6174e218
commit 2f3da075f8
2 changed files with 3 additions and 2 deletions

View file

@ -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"

View file

@ -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!