Merge branch 'master' into production

This commit is contained in:
Nick Winter 2015-02-05 16:14:42 -08:00
commit 098bc3046b

View file

@ -369,10 +369,10 @@ module.exports = class CampaignView extends RootView
level = new Level().setURL levelURL
level = @supermodel.loadModel(level, 'level', null, 0).model
sessionURL = "/db/level/#{levelSlug}/session"
@preloadedSession = new LevelSession().setURL sessionURL
@preloadedSession.levelSlug = levelSlug
@preloadedSession.fetch()
@listenToOnce @preloadedSession, 'sync', @onSessionPreloaded
#@preloadedSession = new LevelSession().setURL sessionURL
#@preloadedSession.levelSlug = levelSlug
#@preloadedSession.fetch()
#@listenToOnce @preloadedSession, 'sync', @onSessionPreloaded
onSessionPreloaded: (session) ->
levelElement = @$el.find('.level-info-container:visible')