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

Merge branch 'master' into production

Browse source
This commit is contained in:
Nick Winter 2014-05-20 08:24:15 -07:00
commit 1cd2035450
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/views/play/common/ladder_submission_view.coffee
View file

@ -72,6 +72,9 @@ module.exports = class LadderSubmissionView extends CocoView
transpileSession: ->
submittedCode = @session.get('code')
language = @session.get('codeLanguage') or 'javascript'
@session.set('submittedCodeLanguage', language)
@session.save() # TODO: maybe actually use a callback to make sure this works?
transpiledCode = {}
for thang, spells of submittedCode
transpiledCode[thang] = {}
@ -80,7 +83,7 @@ module.exports = class LadderSubmissionView extends CocoView
#DRY this
aetherOptions =
problems: {}
language: "javascript"
language: language
functionName: spellID
functionParameters: []
yieldConditionally: spellID is "plan"

2
app/views/play/ladder/ladder_view.coffee
View file

@ -65,7 +65,7 @@ module.exports = class LadderView extends RootView
@insertSubView(@simulateTab = new SimulateTabView())
@refreshInterval = setInterval(@fetchSessionsAndRefreshViews.bind(@), 20 * 1000)
hash = document.location.hash[1..] if document.location.hash
if hash and not (hash in ['my-matches', 'simulate', 'ladder'])
if hash and not (hash in ['my-matches', 'simulate', 'ladder', 'prizes', 'rules'])
@showPlayModal(hash) if @sessions.loaded
fetchSessionsAndRefreshViews: ->