codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 08:08:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/codecombat/codecombat

Browse source
This commit is contained in:
Nick Winter 2014-02-20 17:21:03 -08:00
commit 4e5ecb0c9e
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/styles/play/ladder.sass
View file

@ -13,3 +13,10 @@
#simulation-status-text #simulation-status-text
display: inline display: inline
margin-left: 10px margin-left: 10px
.name-col-cell
max-width: 300px
text-overflow: ellipsis
white-space: nowrap
overflow: hidden

5
app/templates/play/ladder.jade
View file

@ -26,13 +26,14 @@ block content
span Leaderboard span Leaderboard
tr tr
th Score th Score
th Name th.name-col-cell Name
th
for session in team.leaderboard.topPlayers.models for session in team.leaderboard.topPlayers.models
- var myRow = session.get('creator') == me.id - var myRow = session.get('creator') == me.id
tr(class=myRow ? "success" : "") tr(class=myRow ? "success" : "")
td.score-cell= session.get('totalScore').toFixed(2) td.score-cell= session.get('totalScore').toFixed(2)
td= session.get('creatorName') || "Anonymous" td.name-col-cell= session.get('creatorName') || "Anonymous"
td td
if(!myRow) if(!myRow)
a(href="/play/level/#{level.get('slug') || level.id}/?team=#{team.otherTeam}&opponent=#{session.id}") Battle as #{team.otherTeam}! a(href="/play/level/#{level.get('slug') || level.id}/?team=#{team.otherTeam}&opponent=#{session.id}") Battle as #{team.otherTeam}!

2
app/views/play/level_view.coffee
View file

@ -137,7 +137,7 @@ module.exports = class PlayLevelView extends View
opponentSpells = opponentSpells.concat spells opponentSpells = opponentSpells.concat spells
otherSession = @levelLoader.opponentSession otherSession = @levelLoader.opponentSession
opponentCode = otherSession?.get('code') or {} opponentCode = otherSession?.get('submittedCode') or {}
myCode = @session.get('code') or {} myCode = @session.get('code') or {}
for spell in opponentSpells for spell in opponentSpells
c = opponentCode[spell] c = opponentCode[spell]