From 32337df156ce526a62760cd4fbf9fea32914e65c Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Thu, 13 Feb 2014 15:09:40 -0800 Subject: [PATCH] Trimmed down the ladder view for now. --- app/templates/play/ladder.jade | 18 ++++++------- app/views/play/ladder_view.coffee | 42 ++++++++++++++++--------------- 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/app/templates/play/ladder.jade b/app/templates/play/ladder.jade index 98ee0f316..7ddaf7ce0 100644 --- a/app/templates/play/ladder.jade +++ b/app/templates/play/ladder.jade @@ -20,12 +20,12 @@ block content table.table for session in team.leaderboard.topPlayers.models tr= session.get('creatorName') - .challengers - h4 Challengers - - if team.easyChallenger - div.challenger-select - | Easy challenger: - button - a(href=link+'?team='+team.id+'&opponent='+team.easyChallenger.id) - //TODO: finish once the scoring system is finished \ No newline at end of file + //.challengers + // h4 Challengers + // + // if team.easyChallenger + // div.challenger-select + // | Easy challenger: + // button + // a(href=link+'?team='+team.id+'&opponent='+team.easyChallenger.id) + // TODO: finish once the scoring system is finished \ No newline at end of file diff --git a/app/views/play/ladder_view.coffee b/app/views/play/ladder_view.coffee index fe98c7b24..1489fa386 100644 --- a/app/views/play/ladder_view.coffee +++ b/app/views/play/ladder_view.coffee @@ -33,15 +33,15 @@ module.exports = class LadderView extends RootView @level.fetch() @level.once 'sync', @onLevelLoaded, @ - @sessions = new LevelSessionsCollection(levelID) - @sessions.fetch({}) - @sessions.once 'sync', @onMySessionsLoaded, @ +# @sessions = new LevelSessionsCollection(levelID) +# @sessions.fetch({}) +# @sessions.once 'sync', @onMySessionsLoaded, @ onLevelLoaded: -> @startLoadingPhaseTwoMaybe() onMySessionsLoaded: -> @startLoadingPhaseTwoMaybe() startLoadingPhaseTwoMaybe: -> - return unless @level.loaded and @sessions.loaded + return unless @level.loaded # and @sessions.loaded @loadPhaseTwo() loadPhaseTwo: -> @@ -55,17 +55,18 @@ module.exports = class LadderView extends RootView @leaderboards = {} @challengers = {} for team in teams - teamSession = _.find @sessions.models, (session) -> session.get('team') is team +# teamSession = _.find @sessions.models, (session) -> session.get('team') is team + teamSession = null @leaderboards[team] = new LeaderboardData(@level, team, teamSession) @leaderboards[team].once 'sync', @onLeaderboardLoaded, @ - @challengers[team] = new ChallengersData(@level, team, teamSession) - @challengers[team].once 'sync', @onChallengersLoaded, @ +# @challengers[team] = new ChallengersData(@level, team, teamSession) +# @challengers[team].once 'sync', @onChallengersLoaded, @ onChallengersLoaded: -> @renderMaybe() onLeaderboardLoaded: -> @renderMaybe() renderMaybe: -> - loaders = _.values(@leaderboards).concat(_.values(@challengers)) + loaders = _.values(@leaderboards) # .concat(_.values(@challengers)) return unless _.every loaders, (loader) -> loader.loaded @startsLoading = false @render() @@ -82,9 +83,9 @@ module.exports = class LadderView extends RootView id: team name: _.string.titleize(team) leaderboard: @leaderboards[team] - easyChallenger: @challengers[team].easyPlayer.models[0] - mediumChallenger: @challengers[team].mediumPlayer.models[0] - hardChallenger: @challengers[team].hardPlayer.models[0] +# easyChallenger: @challengers[team].easyPlayer.models[0] +# mediumChallenger: @challengers[team].mediumPlayer.models[0] +# hardChallenger: @challengers[team].hardPlayer.models[0] }) ctx @@ -94,23 +95,24 @@ module.exports = class LadderView extends RootView class LeaderboardData constructor: (@level, @team, @session) -> + console.log 'creating leaderboard data', @level, @team, @session _.extend @, Backbone.Events @topPlayers = new LeaderboardCollection(@level, {order:-1, scoreOffset: HIGHEST_SCORE, team: @team, limit: if @session then 10 else 20}) @topPlayers.fetch() @topPlayers.once 'sync', @leaderboardPartLoaded, @ - if @session - score = @session.get('score') or 25 - @playersAbove = new LeaderboardCollection(@level, {order:1, scoreOffset: score, limit: 4, team: @team}) - @playersAbove.fetch() - @playersAbove.once 'sync', @leaderboardPartLoaded, @ - @playersBelow = new LeaderboardCollection(@level, {order:-1, scoreOffset: score, limit: 4, team: @team}) - @playersBelow.fetch() - @playersBelow.once 'sync', @leaderboardPartLoaded, @ +# if @session +# score = @session.get('score') or 25 +# @playersAbove = new LeaderboardCollection(@level, {order:1, scoreOffset: score, limit: 4, team: @team}) +# @playersAbove.fetch() +# @playersAbove.once 'sync', @leaderboardPartLoaded, @ +# @playersBelow = new LeaderboardCollection(@level, {order:-1, scoreOffset: score, limit: 4, team: @team}) +# @playersBelow.fetch() +# @playersBelow.once 'sync', @leaderboardPartLoaded, @ leaderboardPartLoaded: -> if @session - if @topPlayers.loaded and @playersAbove.loaded and @playersBelow.loaded + if @topPlayers.loaded # and @playersAbove.loaded and @playersBelow.loaded @loaded = true @trigger 'sync' else