mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2024-11-23 23:58:02 -05:00
Merge branch 'master' of https://github.com/codecombat/codecombat
This commit is contained in:
commit
4e5ecb0c9e
3 changed files with 11 additions and 3 deletions
|
@ -13,3 +13,10 @@
|
|||
#simulation-status-text
|
||||
display: inline
|
||||
margin-left: 10px
|
||||
|
||||
.name-col-cell
|
||||
max-width: 300px
|
||||
text-overflow: ellipsis
|
||||
white-space: nowrap
|
||||
overflow: hidden
|
||||
|
|
@ -26,13 +26,14 @@ block content
|
|||
span Leaderboard
|
||||
tr
|
||||
th Score
|
||||
th Name
|
||||
th.name-col-cell Name
|
||||
th
|
||||
|
||||
for session in team.leaderboard.topPlayers.models
|
||||
- var myRow = session.get('creator') == me.id
|
||||
tr(class=myRow ? "success" : "")
|
||||
td.score-cell= session.get('totalScore').toFixed(2)
|
||||
td= session.get('creatorName') || "Anonymous"
|
||||
td.name-col-cell= session.get('creatorName') || "Anonymous"
|
||||
td
|
||||
if(!myRow)
|
||||
a(href="/play/level/#{level.get('slug') || level.id}/?team=#{team.otherTeam}&opponent=#{session.id}") Battle as #{team.otherTeam}!
|
||||
|
|
|
@ -137,7 +137,7 @@ module.exports = class PlayLevelView extends View
|
|||
opponentSpells = opponentSpells.concat spells
|
||||
|
||||
otherSession = @levelLoader.opponentSession
|
||||
opponentCode = otherSession?.get('code') or {}
|
||||
opponentCode = otherSession?.get('submittedCode') or {}
|
||||
myCode = @session.get('code') or {}
|
||||
for spell in opponentSpells
|
||||
c = opponentCode[spell]
|
||||
|
|
Loading…
Reference in a new issue