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

Fixed bug with linking to #my-matches tab.

Browse source
This commit is contained in:
Nick Winter 2014-03-08 11:37:33 -08:00
parent 68099bbd7c
commit 1c44e3df1e
2 changed files with 11 additions and 9 deletions

16
app/views/play/ladder/play_modal.coffee
View file

@ -11,7 +11,7 @@ module.exports = class LadderPlayModal extends View
closeButton: true
startsLoading: true
@shownTutorialButton: false
events:
'click #skip-tutorial-button': 'hideTutorialButtons'
@ -21,7 +21,7 @@ module.exports = class LadderPlayModal extends View
@otherTeam = if team is 'ogres' then 'humans' else 'ogres'
@startLoadingChallengersMaybe()
@wizardType = ThangType.loadUniversalWizard()
# PART 1: Load challengers from the db unless some are in the matches
startLoadingChallengersMaybe: ->
@ -49,12 +49,12 @@ module.exports = class LadderPlayModal extends View
type: 'POST'
success: success
})
# PART 3: Make sure wizard is loaded
checkWizardLoaded: ->
if @wizardType.loaded then @finishRendering() else @wizardType.once 'sync', @finishRendering, @
# PART 4: Render
finishRendering: ->
@ -69,7 +69,7 @@ module.exports = class LadderPlayModal extends View
ctx.teamName = _.string.titleize @team
ctx.teamID = @team
ctx.otherTeamID = @otherTeam
teamsList = teamDataFromLevel @level
teams = {}
teams[team.id] = team for team in teamsList
@ -104,7 +104,7 @@ module.exports = class LadderPlayModal extends View
@$el.find('#normal-view').removeClass('secret')
@$el.find('.modal-header').removeClass('secret')
@$el.find('#noob-view').addClass('secret')
# Choosing challengers
getChallengers: ->
@ -165,7 +165,7 @@ class ChallengersData
@hardPlayer = new LeaderboardCollection(@level, {order:-1, scoreOffset: score + 5, limit: 1, team: @otherTeam})
@hardPlayer.fetch()
@hardPlayer.once 'sync', @challengerLoaded, @
challengerLoaded: ->
if @allLoaded()
@loaded = true

4
app/views/play/ladder_view.coffee
View file

@ -66,7 +66,9 @@ module.exports = class LadderView extends RootView
@insertSubView(@ladderTab = new LadderTabView({}, @level, @sessions))
@insertSubView(@myMatchesTab = new MyMatchesTabView({}, @level, @sessions))
@refreshInterval = setInterval(@fetchSessionsAndRefreshViews.bind(@), 10000)
@showPlayModal(document.location.hash[1..]) if document.location.hash and @sessions.loaded
hash = document.location.hash[1..] if document.location.hash
unless hash in ['my-matches', 'simulate', 'ladder']
@showPlayModal(hash) if @sessions.loaded
fetchSessionsAndRefreshViews: ->
@sessions.fetch({"success": @refreshViews})