codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-04-14 05:55:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged conflicts.

Browse source
This commit is contained in:
Scott Erickson 2014-03-21 19:56:25 -07:00
parent 6445924598
commit 2cdfbf1c48
2 changed files with 1 additions and 11 deletions
app
templates/play/ladder
ladder_tab.jade
views/play/ladder
ladder_tab.coffee

6
app/templates/play/ladder/ladder_tab.jade
View file

@ -27,11 +27,7 @@ div#columns.row
a(href="/play/level/#{level.get('slug') || level.id}/?team=#{team.otherTeam}&opponent=#{session.id}")
span(data-i18n="ladder.fight") Fight!
<<<<<<< HEAD
if !showJustTop
=======
if !inTheTop && team.leaderboard.nearbySessions().length
>>>>>>> b91f3200c216482908a3b5762f91134c6c602a8f
if !showJustTop && team.leaderboard.nearbySessions().length
tr(class="active")
td(colspan=4).ellipsis-row ...
for session in team.leaderboard.nearbySessions()

6
app/views/play/ladder/ladder_tab.coffee
View file

@ -114,15 +114,9 @@ class LeaderboardData
level = "#{level.get('original')}.#{level.get('version').major}"
success = (@myRank) =>
promises.push $.ajax "/db/level/#{level}/leaderboard_rank?scoreOffset=#{@session.get('totalScore')}&team=#{@team}", {success}
<<<<<<< HEAD
@promise = $.when(promises...)
@promise.then @onLoad
@promise
=======
$.when(promises...).then @onLoad
>>>>>>> b91f3200c216482908a3b5762f91134c6c602a8f
onLoad: =>
@loaded = true