Skip to content

Commit

Permalink
Changed spell to spellObj in ng-repeat for class spells in order to
Browse files Browse the repository at this point in the history
assist with applying an active class to current spell. (would collide
with $scope.spell in rootCtrl.js)
  • Loading branch information
crookedneighbor committed Jan 6, 2015
1 parent 53c466e commit 9da000e
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions views/shared/tasks/lists.jade
Original file line number Diff line number Diff line change
Expand Up @@ -122,19 +122,19 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")

// Spells
ul.items(ng-if='main && list.type=="reward" && user.stats.class && !user.preferences.disableClasses')
li.task.reward-item(ng-repeat='(k,spell) in Content.spells[user.stats.class]', ng-if='user.stats.lvl >= spell.lvl',popover-trigger='mouseenter', popover-placement='top', popover='{{spell.notes()}}')
li.task.reward-item(ng-repeat='(k,spellObj) in Content.spells[user.stats.class]', ng-if='user.stats.lvl >= spellObj.lvl',popover-trigger='mouseenter', popover-placement='top', popover='{{spellObj.notes()}}')
.task-meta-controls
span.task-notes
span.glyphicon.glyphicon-comment
//left-hand size commands
.task-controls.task-primary
a.money.btn-buy.item-btn(ng-click='castStart(spell)')
a.money.btn-buy.item-btn(ng-click='castStart(spellObj)')
span.reward-cost
strong {{spell.mana}}
strong {{spellObj.mana}}
=env.t('mp')
// main content
span(ng-class='{"shop_{{spell.key}} shop-sprite item-img": true}')
p.task-text {{spell.text()}}
span(ng-class='{"shop_{{spellObj.key}} shop-sprite item-img": true}')
p.task-text {{spellObj.text()}}

br

Expand Down

0 comments on commit 9da000e

Please sign in to comment.