codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-04-30 07:53:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tweak Promises in PlayGameDevLevelView

Browse source
This commit is contained in:
Scott Erickson 2016-07-13 13:52:22 -07:00
parent 45c8c2006d
commit c9986ee05a
2 changed files with 3 additions and 3 deletions

2
app/lib/LevelLoader.coffee
View file

@ -56,6 +56,7 @@ module.exports = class LevelLoader extends CocoClass
loadWorldNecessities: -> loadWorldNecessities: ->
# TODO: Actually trigger loading, instead of in the constructor # TODO: Actually trigger loading, instead of in the constructor
new Promise((resolve, reject) => new Promise((resolve, reject) =>
return resolve(@) if @world
@once 'world-necessities-loaded', => resolve(@) @once 'world-necessities-loaded', => resolve(@)
@once 'world-necessity-load-failed', ({resource}) -> @once 'world-necessity-load-failed', ({resource}) ->
{ jqxhr } = resource { jqxhr } = resource
@ -382,7 +383,6 @@ module.exports = class LevelLoader extends CocoClass
onSupermodelLoaded: -> onSupermodelLoaded: ->
return if @destroyed return if @destroyed
console.log 'SuperModel for Level loaded in', new Date().getTime() - @t0, 'ms' if LOG console.log 'SuperModel for Level loaded in', new Date().getTime() - @t0, 'ms' if LOG
console.log 'supermodel loaded'
@loadLevelSounds() @loadLevelSounds()
@denormalizeSession() @denormalizeSession()

4
app/views/play/level/PlayGameDevLevelView.coffee
View file

@ -37,7 +37,7 @@ module.exports = class PlayGameDevLevelView extends RootView
@levelLoader.loadWorldNecessities() @levelLoader.loadWorldNecessities()
.then (levelLoader) => # grabbing from the levelLoader .then (levelLoader) =>
{ @level, @session, @world } = levelLoader { @level, @session, @world } = levelLoader
@god.setLevel(@level.serialize(@supermodel, @session)) @god.setLevel(@level.serialize(@supermodel, @session))
@god.setWorldClassMap(@world.classMap) @god.setWorldClassMap(@world.classMap)
@ -45,7 +45,7 @@ module.exports = class PlayGameDevLevelView extends RootView
@god.setGoalManager(@goalManager) @god.setGoalManager(@goalManager)
me.team = TEAM me.team = TEAM
@session.set 'team', TEAM @session.set 'team', TEAM
return @supermodel.finishLoading() @supermodel.finishLoading()
.then (supermodel) => .then (supermodel) =>
@levelLoader.destroy() @levelLoader.destroy()