From c9986ee05a96508ad2cd4280a7af11b8345a1488 Mon Sep 17 00:00:00 2001
From: Scott Erickson <sderickson@gmail.com>
Date: Wed, 13 Jul 2016 13:52:22 -0700
Subject: [PATCH] Tweak Promises in PlayGameDevLevelView
---
app/lib/LevelLoader.coffee | 2 +-
app/views/play/level/PlayGameDevLevelView.coffee | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/lib/LevelLoader.coffee b/app/lib/LevelLoader.coffee
index c7d7bc2b5..6a15df091 100644
--- a/app/lib/LevelLoader.coffee
+++ b/app/lib/LevelLoader.coffee
@@ -56,6 +56,7 @@ module.exports = class LevelLoader extends CocoClass
loadWorldNecessities: ->
# TODO: Actually trigger loading, instead of in the constructor
new Promise((resolve, reject) =>
+ return resolve(@) if @world
@once 'world-necessities-loaded', => resolve(@)
@once 'world-necessity-load-failed', ({resource}) ->
{ jqxhr } = resource
@@ -382,7 +383,6 @@ module.exports = class LevelLoader extends CocoClass
onSupermodelLoaded: ->
return if @destroyed
console.log 'SuperModel for Level loaded in', new Date().getTime() - @t0, 'ms' if LOG
- console.log 'supermodel loaded'
@loadLevelSounds()
@denormalizeSession()
diff --git a/app/views/play/level/PlayGameDevLevelView.coffee b/app/views/play/level/PlayGameDevLevelView.coffee
index c9b5bcc9b..78d18e8f8 100644
--- a/app/views/play/level/PlayGameDevLevelView.coffee
+++ b/app/views/play/level/PlayGameDevLevelView.coffee
@@ -37,7 +37,7 @@ module.exports = class PlayGameDevLevelView extends RootView
@levelLoader.loadWorldNecessities()
- .then (levelLoader) => # grabbing from the levelLoader
+ .then (levelLoader) =>
{ @level, @session, @world } = levelLoader
@god.setLevel(@level.serialize(@supermodel, @session))
@god.setWorldClassMap(@world.classMap)
@@ -45,7 +45,7 @@ module.exports = class PlayGameDevLevelView extends RootView
@god.setGoalManager(@goalManager)
me.team = TEAM
@session.set 'team', TEAM
- return @supermodel.finishLoading()
+ @supermodel.finishLoading()
.then (supermodel) =>
@levelLoader.destroy()