Merge branch 'master' into production

This commit is contained in:
Nick Winter 2016-07-29 16:36:50 -07:00
commit 18f8f3fd41

View file

@ -381,6 +381,7 @@ module.exports = class Simulator extends CocoClass
sessionInfo = _.filter(@task.getSessions(), {team: team})[0] sessionInfo = _.filter(@task.getSessions(), {team: team})[0]
fullSpellName = _.string.slugify(hero) + '/plan' fullSpellName = _.string.slugify(hero) + '/plan'
submittedCodeLanguage = sessionInfo?.submittedCodeLanguage ? 'javascript' submittedCodeLanguage = sessionInfo?.submittedCodeLanguage ? 'javascript'
submittedCodeLanguage = 'javascript' if submittedCodeLanguage in ['clojure', 'io'] # No longer supported
submittedCode = LZString.decompressFromUTF16 sessionInfo?.submittedCode?[_.string.slugify(hero)]?.plan ? '' submittedCode = LZString.decompressFromUTF16 sessionInfo?.submittedCode?[_.string.slugify(hero)]?.plan ? ''
aether = new Aether createAetherOptions functionName: 'plan', codeLanguage: submittedCodeLanguage, skipProtectAPI: false aether = new Aether createAetherOptions functionName: 'plan', codeLanguage: submittedCodeLanguage, skipProtectAPI: false
try try